Move a bunch of functions from Window onto Widget.

views/window/native_window_win.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/native_window_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 
 #include "base/i18n/rtl.h"
@@ skipping 1157 matching lines @@
     }
   }
 }
 
 void NativeWindowWin::SetWindowBounds(const gfx::Rect& bounds,
                                       gfx::NativeWindow other_window) {
   SetChildBounds(GetNativeView(), GetParent(), other_window, bounds,
                  kMonitorEdgePadding, 0);
 }
 
-void NativeWindowWin::HideWindow() {
-  // We can just call the function implemented by the widget.
-  Hide();
-}
-
-void NativeWindowWin::Activate() {
-  if (IsMinimized())
-    ::ShowWindow(GetNativeView(), SW_RESTORE);
-  ::SetWindowPos(GetNativeView(), HWND_TOP, 0, 0, 0, 0,
-                 SWP_NOSIZE | SWP_NOMOVE);
-  SetForegroundWindow(GetNativeView());
-}
-
-void NativeWindowWin::Deactivate() {
-  HWND hwnd = ::GetNextWindow(GetNativeView(), GW_HWNDNEXT);
-  if (hwnd)
-    ::SetForegroundWindow(hwnd);
-}
-
-void NativeWindowWin::Maximize() {
-  ExecuteSystemMenuCommand(SC_MAXIMIZE);
-}
-
-void NativeWindowWin::Minimize() {
-  ExecuteSystemMenuCommand(SC_MINIMIZE);
-}
-
-void NativeWindowWin::Restore() {
-  ExecuteSystemMenuCommand(SC_RESTORE);
-}
-
-bool NativeWindowWin::IsActive() const {
-  return is_active_;
-}
-
-bool NativeWindowWin::IsVisible() const {
-  return !!::IsWindowVisible(GetNativeView());
-}
-
-bool NativeWindowWin::IsMaximized() const {
-  return !!::IsZoomed(GetNativeView());
-}
-
-bool NativeWindowWin::IsMinimized() const {
-  return !!::IsIconic(GetNativeView());
-}
-
 void NativeWindowWin::SetFullscreen(bool fullscreen) {
   if (fullscreen_ == fullscreen)
     return;  // Nothing to do.
 
   // Reduce jankiness during the following position changes by hiding the window
   // until it's in the final position.
   PushForceHidden();
 
   // Size/position/style window appropriately.
   if (!fullscreen_) {
@@ skipping 41 matching lines @@
   }
 
   // Undo our anti-jankiness hacks.
   PopForceHidden();
 }
 
 bool NativeWindowWin::IsFullscreen() const {
   return fullscreen_;
 }
 
-void NativeWindowWin::SetAlwaysOnTop(bool always_on_top) {
-  ::SetWindowPos(GetNativeView(), always_on_top ? HWND_TOPMOST : HWND_NOTOPMOST,
-                 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
-}
-
 void NativeWindowWin::SetUseDragFrame(bool use_drag_frame) {
   if (use_drag_frame) {
     // Make the frame slightly transparent during the drag operation.
     drag_frame_saved_window_style_ = GetWindowLong(GWL_STYLE);
     drag_frame_saved_window_ex_style_ = GetWindowLong(GWL_EXSTYLE);
     SetWindowLong(GWL_EXSTYLE,
                   drag_frame_saved_window_ex_style_ | WS_EX_LAYERED);
     // Remove the captions tyle so the window doesn't have window controls for a
     // more "transparent" look.
     SetWindowLong(GWL_STYLE, drag_frame_saved_window_style_ & ~WS_CAPTION);
@@ skipping 46 matching lines @@
   // type.
   GetWindow()->non_client_view()->UpdateFrame();
 
   // WM_DWMCOMPOSITIONCHANGED is only sent to top level windows, however we want
   // to notify our children too, since we can have MDI child windows who need to
   // update their appearance.
   EnumChildWindows(GetNativeView(), &SendDwmCompositionChanged, NULL);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// NativeWindowWin, NativeWidgetWin overrides:
+
+bool NativeWindowWin::IsActive() const {
+  // TODO(beng): evaluate whether or not this is needed. NativeWidgetWin checks
+  //             active-state with the OS using GetWindowInfo().
+  return is_active_;
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // NativeWindowWin, private:
 
 void NativeWindowWin::RestoreEnabledIfNecessary() {
   if (delegate_->IsModal() && !restored_enabled_) {
     restored_enabled_ = true;
     // If we were run modally, we need to undo the disabled-ness we inflicted on
     // the owner's parent hierarchy.
     HWND start = GetOwner(GetNativeView());
     while (start) {
       ::EnableWindow(start, TRUE);
@@ skipping 82 matching lines @@
 }
 
 LRESULT NativeWindowWin::CallDefaultNCActivateHandler(BOOL active) {
   // The DefWindowProc handling for WM_NCACTIVATE renders the classic-look
   // window title bar directly, so we need to use a redraw lock here to prevent
   // it from doing so.
   ScopedRedrawLock lock(this);
   return DefWindowProc(GetNativeView(), WM_NCACTIVATE, active, 0);
 }
 
-void NativeWindowWin::ExecuteSystemMenuCommand(int command) {
-  if (command)
-    SendMessage(GetNativeView(), WM_SYSCOMMAND, command, 0);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWindow, public:
 
 // static
 NativeWindow* NativeWindow::CreateNativeWindow(
     internal::NativeWindowDelegate* delegate) {
   return new NativeWindowWin(delegate);
 }
 
 }  // namespace views