Fix ::GetBounds() and ::SetBounds() in NativeAppWindowGtk.

chrome/browser/ui/gtk/apps/native_app_window_gtk.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/apps/native_app_window_gtk.h"
 
 #include <gdk/gdkx.h>
 #include <vector>
 
 #include "base/message_loop/message_pump_gtk.h"
@@ skipping 184 matching lines @@
 
 ui::WindowShowState NativeAppWindowGtk::GetRestoredState() const {
   if (IsMaximized())
     return ui::SHOW_STATE_MAXIMIZED;
   if (IsFullscreen())
     return ui::SHOW_STATE_FULLSCREEN;
   return ui::SHOW_STATE_NORMAL;
 }
 
 gfx::Rect NativeAppWindowGtk::GetBounds() const {
-  gfx::Rect window_bounds = bounds_;
-  window_bounds.Inset(-GetFrameInsets());
-  return window_bounds;
+  // :GetBounds() is expecting the outer window bounds to be returned (ie.
+  // including window decorations). The internal |bounds_| is not including them
+  // and trying to add the decoration to |bounds_| would require calling
+  // gdk_window_get_frame_extents. The best thing to do is to directly get the
+  // frame bounds and only use the internal value if we can't.
+  GdkWindow* gdk_window = gtk_widget_get_window(GTK_WIDGET(window_));
+  if (!gdk_window)
+    return bounds_;
+
+  GdkRectangle window_bounds = {0};
+  gdk_window_get_frame_extents(gdk_window, &window_bounds);
+  return gfx::Rect(window_bounds.x, window_bounds.y,
+                   window_bounds.width, window_bounds.height);
 }
 
 void NativeAppWindowGtk::Show() {
   gtk_window_present(window_);
 }
 
 void NativeAppWindowGtk::ShowInactive() {
   gtk_window_set_focus_on_map(window_, false);
   gtk_widget_show(GTK_WIDGET(window_));
 }
@@ skipping 59 matching lines @@
 
   // Represent the window to keep restoration behavior consistency with Windows
   // platform.
   // TODO(zhchbin): verify whether we need this until http://crbug.com/261013 is
   // fixed.
   gtk_window_present(window_);
 }
 
 void NativeAppWindowGtk::SetBounds(const gfx::Rect& bounds) {
   gfx::Rect content_bounds = bounds;
-  content_bounds.Inset(GetFrameInsets());
   gtk_window_move(window_, content_bounds.x(), content_bounds.y());
   if (!resizable_) {
     if (frameless_ &&
         gtk_window_util::BoundsMatchMonitorSize(window_, content_bounds)) {
       content_bounds.set_height(content_bounds.height() - 1);
     }
     // TODO(jeremya): set_size_request doesn't honor min/max size, so the
     // bounds should be constrained manually.
     gtk_widget_set_size_request(GTK_WIDGET(window_),
         content_bounds.width(), content_bounds.height());
@@ skipping 15 matching lines @@
   if (x_event->type == PropertyNotify &&
       x_event->xproperty.atom == atom_cache_.GetAtom("_NET_WM_STATE") &&
       GTK_WIDGET(window_)->window &&
       ui::GetAtomArrayProperty(GDK_WINDOW_XWINDOW(GTK_WIDGET(window_)->window),
                                "_NET_WM_STATE",
                                &atom_list)) {
     std::vector< ::Atom>::iterator it =
         std::find(atom_list.begin(),
                   atom_list.end(),
                   atom_cache_.GetAtom("_NET_WM_STATE_HIDDEN"));
+
     state_ = (it != atom_list.end()) ? GDK_WINDOW_STATE_ICONIFIED :
         static_cast<GdkWindowState>(state_ & ~GDK_WINDOW_STATE_ICONIFIED);
 
+    // TODO(mlamouri): we don't need to send a change event all the time here.
+    // Only when |state_| has actually changed.
     shell_window_->OnNativeWindowChanged();
   }
 
   return GDK_FILTER_CONTINUE;
 }
 
 void NativeAppWindowGtk::FlashFrame(bool flash) {
   gtk_window_set_urgency_hint(window_, flash);
 }
 
@@ skipping 362 matching lines @@
     hints_mask |= GDK_HINT_MAX_SIZE;
   }
   if (hints_mask) {
     gtk_window_set_geometry_hints(
         window_,
         GTK_WIDGET(window_),
         &hints,
         static_cast<GdkWindowHints>(hints_mask));
   }
 }