Status bubble limping in TOOLKIT_VIEWS....

views/window/window_gtk.cc

 // Copyright (c) 2009 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 "views/window/window_gtk.h"
 
 #include "app/gfx/path.h"
 #include "app/l10n_util.h"
 #include "base/gfx/rect.h"
+#include "views/screen.h"
 #include "views/widget/root_view.h"
 #include "views/window/custom_frame_view.h"
 #include "views/window/hit_test.h"
 #include "views/window/non_client_view.h"
 #include "views/window/window_delegate.h"
 
 namespace {
 
 // Converts a Windows-style hit test result code into a GDK window edge.
 GdkWindowEdge HitTestCodeToGDKWindowEdge(int hittest_code) {
@@ skipping 43 matching lines @@
       return GDK_TOP_LEFT_CORNER;
     case HTTOPRIGHT:
       return GDK_TOP_RIGHT_CORNER;
     default:
       break;
   }
   // Default to something defaultish.
   return GDK_ARROW;
 }
 
-gfx::Rect GetScreenWorkArea(GdkWindow* window) {
-  guchar* raw_data = NULL;
-  gint data_len = 0;
-  gboolean success = gdk_property_get(gdk_get_default_root_window(),
-                                      gdk_atom_intern("_NET_WORKAREA", FALSE),
-                                      gdk_atom_intern("CARDINAL", FALSE),
-                                      0, 0xFF, false, NULL, NULL, &data_len,
-                                      &raw_data);
-  DCHECK(success);
-  glong* data = reinterpret_cast<glong*>(raw_data);
-  return gfx::Rect(data[0], data[1], data[0] + data[2], data[1] + data[3]);
-}
-
 }  // namespace
 
 namespace views {
 
 WindowGtk::~WindowGtk() {
 }
 
 // static
 Window* Window::CreateChromeWindow(gfx::NativeWindow parent,
                                    const gfx::Rect& bounds,
@@ skipping 339 matching lines @@
     // We have a parent window, center over it.
     gint parent_x = 0;
     gint parent_y = 0;
     gtk_window_get_position(parent, &parent_x, &parent_y);
     gint parent_w = 0;
     gint parent_h = 0;
     gtk_window_get_size(parent, &parent_w, &parent_h);
     center_rect = gfx::Rect(parent_x, parent_y, parent_w, parent_h);
   } else {
     // We have no parent window, center over the screen.
-    center_rect = GetScreenWorkArea(GTK_WIDGET(GetNativeWindow())->window);
+    center_rect = Screen::GetMonitorWorkAreaNearestWindow(GetNativeWindow());
   }
   gfx::Size size = non_client_view_->GetPreferredSize();
   gfx::Rect bounds(center_rect.x() + (center_rect.width() - size.width()) / 2,
                    center_rect.y() + (center_rect.height() - size.height()) / 2,
                    size.width(), size.height());
   SetBounds(bounds, NULL);
 }
 
 }  // namespace views