Revert 86914 - Move a bunch of functions from Window onto Widget.

views/window/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 "views/window/window.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_font_util.h"
@@ skipping 94 matching lines @@
 
 gfx::Rect Window::GetNormalBounds() const {
   return native_window_->GetRestoredBounds();
 }
 
 void Window::SetWindowBounds(const gfx::Rect& bounds,
                              gfx::NativeWindow other_window) {
   native_window_->SetWindowBounds(bounds, other_window);
 }
 
+void Window::Show() {
+  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.
+  saved_maximized_state_ = false;
+}
+
 void Window::ShowInactive() {
   native_window_->ShowNativeWindow(NativeWindow::SHOW_INACTIVE);
 }
 
+void Window::HideWindow() {
+  native_window_->HideWindow();
+}
+
 void Window::DisableInactiveRendering() {
   disable_inactive_rendering_ = true;
   non_client_view_->DisableInactiveRendering(disable_inactive_rendering_);
 }
 
+void Window::Activate() {
+  native_window_->Activate();
+}
+
+void Window::Deactivate() {
+  native_window_->Deactivate();
+}
+
+void Window::Close() {
+  if (window_closed_) {
+    // It appears we can hit this code path if you close a modal dialog then
+    // close the last browser before the destructor is hit, which triggers
+    // invoking Close again.
+    return;
+  }
+
+  if (non_client_view_->CanClose()) {
+    SaveWindowPosition();
+    Widget::Close();
+    window_closed_ = true;
+  }
+}
+
+void Window::Maximize() {
+  native_window_->Maximize();
+}
+
+void Window::Minimize() {
+  native_window_->Minimize();
+}
+
+void Window::Restore() {
+  native_window_->Restore();
+}
+
+bool Window::IsActive() const {
+  return native_window_->IsActive();
+}
+
+bool Window::IsVisible() const {
+  return native_window_->IsVisible();
+}
+
+bool Window::IsMaximized() const {
+  return native_window_->IsMaximized();
+}
+
+bool Window::IsMinimized() const {
+  return native_window_->IsMinimized();
+}
+
 void Window::SetFullscreen(bool fullscreen) {
   native_window_->SetFullscreen(fullscreen);
 }
 
 bool Window::IsFullscreen() const {
   return native_window_->IsFullscreen();
 }
 
 void Window::SetUseDragFrame(bool use_drag_frame) {
   native_window_->SetUseDragFrame(use_drag_frame);
@@ skipping 19 matching lines @@
   base::i18n::AdjustStringForLocaleDirection(&window_title);
   native_window_->SetWindowTitle(UTF16ToWide(window_title));
 }
 
 void Window::UpdateWindowIcon() {
   non_client_view_->UpdateWindowIcon();
   native_window_->SetWindowIcons(window_delegate_->GetWindowIcon(),
                                  window_delegate_->GetWindowAppIcon());
 }
 
+void Window::SetIsAlwaysOnTop(bool always_on_top) {
+  native_window_->SetAlwaysOnTop(always_on_top);
+}
+
 NonClientFrameView* Window::CreateFrameViewForWindow() {
   NonClientFrameView* frame_view = native_window_->CreateFrameViewForWindow();
   return frame_view ? frame_view : new CustomFrameView(this);
 }
 
 void Window::UpdateFrameAfterFrameChange() {
   native_window_->UpdateFrameAfterFrameChange();
 }
 
+gfx::NativeWindow Window::GetNativeWindow() const {
+  return native_window_->GetNativeWindow();
+}
+
 bool Window::ShouldUseNativeFrame() const {
   if (frame_type_ != FRAME_TYPE_DEFAULT)
     return frame_type_ == FRAME_TYPE_FORCE_NATIVE;
   return native_window_->ShouldUseNativeFrame();
 }
 
 void Window::DebugToggleFrameType() {
   if (frame_type_ == FRAME_TYPE_DEFAULT) {
     frame_type_ = ShouldUseNativeFrame() ? FRAME_TYPE_FORCE_CUSTOM :
         FRAME_TYPE_FORCE_NATIVE;
   } else {
     frame_type_ = frame_type_ == FRAME_TYPE_FORCE_CUSTOM ?
         FRAME_TYPE_FORCE_NATIVE : FRAME_TYPE_FORCE_CUSTOM;
   }
   FrameTypeChanged();
 }
 
 void Window::FrameTypeChanged() {
   native_window_->FrameTypeChanged();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// Window, Widget overrides:
-
-void Window::Show() {
-  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.
-  saved_maximized_state_ = false;
-}
-
-void Window::Close() {
-  if (window_closed_) {
-    // It appears we can hit this code path if you close a modal dialog then
-    // close the last browser before the destructor is hit, which triggers
-    // invoking Close again.
-    return;
-  }
-
-  if (non_client_view_->CanClose()) {
-    SaveWindowPosition();
-    Widget::Close();
-    window_closed_ = true;
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // Window, internal::NativeWindowDelegate implementation:
 
 bool Window::CanActivate() const {
   return window_delegate_->CanActivate();
 }
 
 bool Window::IsInactiveRenderingDisabled() const {
   return disable_inactive_rendering_;
 }
 
@@ skipping 133 matching lines @@
   if (!window_delegate_)
     return;
 
   bool maximized;
   gfx::Rect bounds;
   native_window_->GetWindowBoundsAndMaximizedState(&bounds, &maximized);
   window_delegate_->SaveWindowPlacement(bounds, maximized);
 }
 
 }  // namespace views