Move a bunch of functions from Window onto Widget.

views/widget/native_widget_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/widget/native_widget_win.h"
 
 #include <dwmapi.h>
 
 #include "base/string_util.h"
 #include "base/system_monitor/system_monitor.h"
@@ skipping 376 matching lines @@
     // NOTE: Be careful not to activate any windows here (for example, calling
     // ShowWindow(SW_HIDE) will automatically activate another window).  This
     // code can be called while a window is being deactivated, and activating
     // another window will screw up the activation that is already in progress.
     SetWindowPos(NULL, 0, 0, 0, 0,
                  SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE |
                  SWP_NOREPOSITION | SWP_NOSIZE | SWP_NOZORDER);
   }
 }
 
+bool NativeWidgetWin::IsVisible() const {
+  return !!::IsWindowVisible(hwnd());
+}
+
+void NativeWidgetWin::Activate() {
+  if (IsMinimized())
+    ::ShowWindow(GetNativeView(), SW_RESTORE);
+  ::SetWindowPos(GetNativeView(), HWND_TOP, 0, 0, 0, 0,
+                 SWP_NOSIZE | SWP_NOMOVE);
+  SetForegroundWindow(GetNativeView());
+}
+
+void NativeWidgetWin::Deactivate() {
+  HWND hwnd = ::GetNextWindow(GetNativeView(), GW_HWNDNEXT);
+  if (hwnd)
+    ::SetForegroundWindow(hwnd);
+}
+
+bool NativeWidgetWin::IsActive() const {
+  return IsWindowActive(hwnd());
+}
+
+void NativeWidgetWin::SetAlwaysOnTop(bool on_top) {
+  ::SetWindowPos(GetNativeView(), on_top ? HWND_TOPMOST : HWND_NOTOPMOST,
+                 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+}
+
+void NativeWidgetWin::Maximize() {
+  ExecuteSystemMenuCommand(SC_MAXIMIZE);
+}
+
+void NativeWidgetWin::Minimize() {
+  ExecuteSystemMenuCommand(SC_MINIMIZE);
+}
+
+bool NativeWidgetWin::IsMaximized() const {
+  return !!::IsZoomed(GetNativeView());
+}
+
+bool NativeWidgetWin::IsMinimized() const {
+  return !!::IsIconic(GetNativeView());
+}
+
+void NativeWidgetWin::Restore() {
+  ExecuteSystemMenuCommand(SC_RESTORE);
+}
+
 void NativeWidgetWin::SetOpacity(unsigned char opacity) {
   layered_alpha_ = static_cast<BYTE>(opacity);
 }
 
-void NativeWidgetWin::SetAlwaysOnTop(bool on_top) {
-  if (on_top)
-    set_window_ex_style(window_ex_style() | WS_EX_TOPMOST);
-  else
-    set_window_ex_style(window_ex_style() & ~WS_EX_TOPMOST);
-}
-
-bool NativeWidgetWin::IsVisible() const {
-  return !!::IsWindowVisible(hwnd());
-}
-
-bool NativeWidgetWin::IsActive() const {
-  return IsWindowActive(hwnd());
-}
-
 bool NativeWidgetWin::IsAccessibleWidget() const {
   return screen_reader_active_;
 }
 
 bool NativeWidgetWin::ContainsNativeView(gfx::NativeView native_view) const {
   return hwnd() == native_view || ::IsChild(hwnd(), native_view);
 }
 
 void NativeWidgetWin::RunShellDrag(View* view,
                                    const ui::OSExchangeData& data,
@@ skipping 564 matching lines @@
 }
 
 void NativeWidgetWin::SetInitialFocus() {
   // TODO(beng): move to Widget.
   View* v = GetWidget()->widget_delegate() ?
       GetWidget()->widget_delegate()->GetInitiallyFocusedView() : NULL;
   if (v)
     v->RequestFocus();
 }
 
+void NativeWidgetWin::ExecuteSystemMenuCommand(int command) {
+  if (command)
+    SendMessage(GetNativeView(), WM_SYSCOMMAND, command, 0);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetWin, private:
 
 // static
 Window* NativeWidgetWin::GetWindowImpl(HWND hwnd) {
   // NOTE: we can't use GetAncestor here as constrained windows are a Window,
   // but not a top level window.
   HWND parent = hwnd;
   while (parent) {
     NativeWidgetWin* widget =
@@ skipping 286 matching lines @@
 
   // And now, notify them that they have a brand new parent.
   for (NativeWidgets::iterator it = widgets.begin();
        it != widgets.end(); ++it) {
     (*it)->GetWidget()->NotifyNativeViewHierarchyChanged(true,
                                                          new_parent);
   }
 }
 
 }  // namespace views