Fix clang build by renaming method ShowWindow()

BUG=72040
TEST=none
TBR=thakis
Review URL: http://codereview.chromium.org/6652016

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

6 files changed, 8 insertions, 7 deletions

diff --git a/views/window/native_window.h b/views/window/native_window.h
index 30fb87a..d3c0eb6 100644
--- a/views/window/native_window.h
+++ b/views/window/native_window.h
@@ -25,7 +25,7 @@ class NativeWindow {
   virtual ~NativeWindow() {}
 
   // Shows the window.
-  virtual void Show(ShowState state) = 0;
+  virtual void ShowNativeWindow(ShowState state) = 0;
 
   // Makes the NativeWindow modal.
   virtual void BecomeModal() = 0;
diff --git a/views/window/window.cc b/views/window/window.cc
index 24034cf..7e04f78 100644
--- a/views/window/window.cc
+++ b/views/window/window.cc
@@ -84,8 +84,9 @@ void Window::SetWindowBounds(const gfx::Rect& bounds,
 }
 
 void Window::Show() {
-  native_window_->Show(saved_maximized_state_ ? NativeWindow::SHOW_MAXIMIZED
-                                              : NativeWindow::SHOW_RESTORED);
+  native_window_->ShowNativeWindow(
+      saved_maximized_state_ ? NativeWindow::SHOW_MAXIMIZED
+                             : NativeWindow::SHOW_RESTORED);
   // |saved_maximized_state_| only applies the first time the window is shown.
   // If we don't reset the value the window will be shown maximized every time
   // it is subsequently shown after being hidden.
diff --git a/views/window/window_gtk.cc b/views/window/window_gtk.cc
index 081b456..955ede3 100644
--- a/views/window/window_gtk.cc
+++ b/views/window/window_gtk.cc
@@ -361,7 +361,7 @@ void WindowGtk::SetInitialFocus() {
 ////////////////////////////////////////////////////////////////////////////////
 // WindowGtk, NativeWindow implementation:
 
-void WindowGtk::Show(ShowState state) {
+void WindowGtk::ShowNativeWindow(ShowState state) {
   // No concept of maximization (yet) on ChromeOS.
   gtk_widget_show(GetNativeView());
 }
diff --git a/views/window/window_gtk.h b/views/window/window_gtk.h
index 57ceeaa..a4b0ab7 100644
--- a/views/window/window_gtk.h
+++ b/views/window/window_gtk.h
@@ -75,7 +75,7 @@ class WindowGtk : public WidgetGtk, public NativeWindow, public Window {
 
  protected:
   // Overridden from NativeWindow:
-  virtual void Show(ShowState state) OVERRIDE;
+  virtual void ShowNativeWindow(ShowState state) OVERRIDE;
   virtual void BecomeModal() OVERRIDE;
   virtual void CenterWindow(const gfx::Size& size) OVERRIDE;
   virtual void SetWindowTitle(const std::wstring& title) OVERRIDE;
diff --git a/views/window/window_win.cc b/views/window/window_win.cc
index 635e563..767d857 100644
--- a/views/window/window_win.cc
+++ b/views/window/window_win.cc
@@ -1167,7 +1167,7 @@ void WindowWin::OnWindowPosChanging(WINDOWPOS* window_pos) {
 ////////////////////////////////////////////////////////////////////////////////
 // WindowWin, NativeWindow implementation:
 
-void WindowWin::Show(ShowState state) {
+void WindowWin::ShowNativeWindow(ShowState state) {
   Show(state == SHOW_MAXIMIZED ? SW_SHOWMAXIMIZED : GetShowState());
 }
 
diff --git a/views/window/window_win.h b/views/window/window_win.h
index 5f291dd..2208405 100644
--- a/views/window/window_win.h
+++ b/views/window/window_win.h
@@ -156,7 +156,7 @@ class WindowWin : public WidgetWin,
   virtual const Window* GetWindow() const OVERRIDE { return this; }
 
   // Overridden from NativeWindow:
-  virtual void Show(ShowState state);
+  virtual void ShowNativeWindow(ShowState state);
   virtual void BecomeModal() OVERRIDE;
   virtual void CenterWindow(const gfx::Size& size) OVERRIDE;
   virtual void SetWindowTitle(const std::wstring& title) OVERRIDE;