Rename Window::SetBounds to SetWindowBounds, to uncofuse overrides.

BUG=70465,72205
TEST=none
TBR=ben

Review URL: http://codereview.chromium.org/6624011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76953 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 15 insertions, 15 deletions

diff --git a/chrome/browser/chromeos/native_dialog_window.cc b/chrome/browser/chromeos/native_dialog_window.cc
index c4f5699..0b325a2 100644
--- a/chrome/browser/chromeos/native_dialog_window.cc
+++ b/chrome/browser/chromeos/native_dialog_window.cc
@@ -147,7 +147,7 @@ void NativeDialogHost::OnCheckResize(GtkWidget* widget) {
       gfx::Rect window_bounds = window()->GetBounds();
       window_bounds.set_width(window_size.width());
       window_bounds.set_height(window_size.height());
-      window()->SetBounds(window_bounds, NULL);
+      window()->SetWindowBounds(window_bounds, NULL);
     }
   }
 }
diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc
index 67c9b8a..ef774bb 100644
--- a/chrome/browser/ui/views/hung_renderer_view.cc
+++ b/chrome/browser/ui/views/hung_renderer_view.cc
@@ -244,7 +244,7 @@ void HungRendererDialogView::ShowForTabContents(TabContents* contents) {
     volatile TabContents* this_contents = contents_;
 
     gfx::Rect bounds = GetDisplayBounds(contents);
-    window()->SetBounds(bounds, frame_hwnd);
+    window()->SetWindowBounds(bounds, frame_hwnd);
 
     // We only do this if the window isn't active (i.e. hasn't been shown yet,
     // or is currently shown but deactivated for another TabContents). This is
diff --git a/views/window/window.h b/views/window/window.h
index e083f68..e5c1137 100644
--- a/views/window/window.h
+++ b/views/window/window.h
@@ -64,8 +64,8 @@ class Window {
   // the window Z-order. If this window is not yet visible, other_window's
   // monitor is used as the constraining rectangle, rather than this window's
   // monitor.
-  virtual void SetBounds(const gfx::Rect& bounds,
-                         gfx::NativeWindow other_window) = 0;
+  virtual void SetWindowBounds(const gfx::Rect& bounds,
+                               gfx::NativeWindow other_window) = 0;
 
   // Makes the window visible.
   virtual void Show() = 0;
diff --git a/views/window/window_gtk.cc b/views/window/window_gtk.cc
index fdf4f50..6c0b7a6 100644
--- a/views/window/window_gtk.cc
+++ b/views/window/window_gtk.cc
@@ -112,8 +112,8 @@ gfx::Rect WindowGtk::GetNormalBounds() const {
   return GetBounds();
 }
 
-void WindowGtk::SetBounds(const gfx::Rect& bounds,
-                          gfx::NativeWindow other_window) {
+void WindowGtk::SetWindowBounds(const gfx::Rect& bounds,
+                                gfx::NativeWindow other_window) {
   // TODO: need to deal with other_window.
   WidgetGtk::SetBounds(bounds);
 }
@@ -468,7 +468,7 @@ void WindowGtk::SetInitialBounds(GtkWindow* parent,
     if (create_bounds.IsEmpty()) {
       SizeWindowToDefault(parent);
     } else {
-      SetBounds(create_bounds, NULL);
+      SetWindowBounds(create_bounds, NULL);
     }
   }
 }
@@ -493,7 +493,7 @@ void WindowGtk::SizeWindowToDefault(GtkWindow* parent) {
   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);
+  SetWindowBounds(bounds, NULL);
 }
 
 void WindowGtk::OnDestroy(GtkWidget* widget) {
diff --git a/views/window/window_gtk.h b/views/window/window_gtk.h
index de84986..164a924 100644
--- a/views/window/window_gtk.h
+++ b/views/window/window_gtk.h
@@ -28,8 +28,8 @@ class WindowGtk : public WidgetGtk, public Window {
   // Overridden from Window:
   virtual gfx::Rect GetBounds() const;
   virtual gfx::Rect GetNormalBounds() const;
-  virtual void SetBounds(const gfx::Rect& bounds,
-                         gfx::NativeWindow other_window);
+  virtual void SetWindowBounds(const gfx::Rect& bounds,
+                               gfx::NativeWindow other_window);
   virtual void Show();
   virtual void HideWindow();
   virtual void SetNativeWindowProperty(const char* name, void* value);
diff --git a/views/window/window_win.cc b/views/window/window_win.cc
index 7776bea..48d3aab 100644
--- a/views/window/window_win.cc
+++ b/views/window/window_win.cc
@@ -237,8 +237,8 @@ gfx::Rect WindowWin::GetNormalBounds() const {
   return bounds;
 }
 
-void WindowWin::SetBounds(const gfx::Rect& bounds,
-                          gfx::NativeWindow other_window) {
+void WindowWin::SetWindowBounds(const gfx::Rect& bounds,
+                                gfx::NativeWindow other_window) {
   SetChildBounds(GetNativeView(), GetParent(), other_window, bounds,
                  kMonitorEdgePadding, 0);
 }
@@ -1315,7 +1315,7 @@ void WindowWin::SetInitialBounds(const gfx::Rect& create_bounds) {
       SizeWindowToDefault();
     } else {
       // Use the supplied initial bounds.
-      SetBounds(create_bounds, NULL);
+      SetWindowBounds(create_bounds, NULL);
     }
   }
 }
diff --git a/views/window/window_win.h b/views/window/window_win.h
index 5cd2bdd..5d0ab5e 100644
--- a/views/window/window_win.h
+++ b/views/window/window_win.h
@@ -66,8 +66,8 @@ class WindowWin : public WidgetWin,
   // Overridden from Window:
   virtual gfx::Rect GetBounds() const;
   virtual gfx::Rect GetNormalBounds() const;
-  virtual void SetBounds(const gfx::Rect& bounds,
-                         gfx::NativeWindow other_window);
+  virtual void SetWindowBounds(const gfx::Rect& bounds,
+                               gfx::NativeWindow other_window);
   virtual void Show();
   virtual void HideWindow();
   virtual void SetNativeWindowProperty(const char* name, void* value);