From 804b4255baea61490a22047a49e1cd49442bb70d Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Wed, 12 Mar 2014 14:37:11 +0000
Subject: [PATCH] Merge revision 1632 changes: - Windows: Don't apply inset to
 borderless windows (issue #1195).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1750@1633 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 patch/patches/views_widget_180.patch | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/patch/patches/views_widget_180.patch b/patch/patches/views_widget_180.patch
index 5361fa7b9..1beb4c473 100644
--- a/patch/patches/views_widget_180.patch
+++ b/patch/patches/views_widget_180.patch
@@ -1,6 +1,6 @@
 Index: desktop_aura/desktop_root_window_host_win.cc
 ===================================================================
---- desktop_aura/desktop_root_window_host_win.cc	(revision 247552)
+--- desktop_aura/desktop_root_window_host_win.cc	(revision 252094)
 +++ desktop_aura/desktop_root_window_host_win.cc	(working copy)
 @@ -132,7 +132,9 @@
                          native_widget_delegate_);
@@ -24,7 +24,7 @@ Index: desktop_aura/desktop_root_window_host_win.cc
  
 Index: desktop_aura/desktop_screen_win.cc
 ===================================================================
---- desktop_aura/desktop_screen_win.cc	(revision 247552)
+--- desktop_aura/desktop_screen_win.cc	(revision 252094)
 +++ desktop_aura/desktop_screen_win.cc	(working copy)
 @@ -54,6 +54,8 @@
  }
@@ -37,7 +37,7 @@ Index: desktop_aura/desktop_screen_win.cc
  }
 Index: widget.cc
 ===================================================================
---- widget.cc	(revision 247552)
+--- widget.cc	(revision 252094)
 +++ widget.cc	(working copy)
 @@ -126,6 +126,7 @@
        show_state(ui::SHOW_STATE_DEFAULT),
@@ -55,9 +55,23 @@ Index: widget.cc
        native_widget(NULL),
        desktop_root_window_host(NULL),
        top_level(false),
+@@ -395,7 +397,12 @@
+       Minimize();
+   } else if (params.delegate) {
+     SetContentsView(params.delegate->GetContentsView());
+-    SetInitialBoundsForFramelessWindow(params.bounds);
++    if (params.parent_widget) {
++      // Set the bounds directly instead of applying an inset.
++      SetBounds(params.bounds);
++    } else {
++      SetInitialBoundsForFramelessWindow(params.bounds);
++    }
+   }
+   native_widget_initialized_ = true;
+ }
 Index: widget.h
 ===================================================================
---- widget.h	(revision 247552)
+--- widget.h	(revision 252094)
 +++ widget.h	(working copy)
 @@ -201,6 +201,7 @@
      // Should the widget be double buffered? Default is false.