Move more from Window onto Widget.

chrome/browser/chromeos/native_dialog_window.cc

 // Copyright (c) 2011 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/chromeos/native_dialog_window.h"
 
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 126 matching lines @@
     GtkRequisition requsition = { 0 };
     gtk_widget_size_request(contents, &requsition);
 
     if (preferred_size_.height() != requsition.height) {
       preferred_size_.set_width(requsition.width);
       preferred_size_.set_height(requsition.height);
       CheckSize();
       SizeToPreferredSize();
 
       gfx::Size window_size = window()->non_client_view()->GetPreferredSize();
-      gfx::Rect window_bounds = window()->GetBounds();
+      gfx::Rect window_bounds = window()->GetWindowScreenBounds();
       window_bounds.set_width(window_size.width());
       window_bounds.set_height(window_size.height());
       window()->SetBoundsConstrained(window_bounds, NULL);
     }
   }
 }
 
 void NativeDialogHost::OnDialogDestroy(GtkWidget* widget) {
   dialog_ = NULL;
   destroy_signal_id_ = 0;
@@ skipping 123 matching lines @@
   return host ? host->window()->GetNativeWindow() : NULL;
 }
 
 gfx::Rect GetNativeDialogContentsBounds(gfx::NativeView native_dialog) {
   NativeDialogHost* host = reinterpret_cast<NativeDialogHost*>(
       g_object_get_data(G_OBJECT(native_dialog), kNativeDialogHost));
   return host ? host->bounds() : gfx::Rect();
 }
 
 }  // namespace chromeos