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

views/widget/widget.h

 // 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.
 
 #ifndef VIEWS_WIDGET_WIDGET_H_
 #define VIEWS_WIDGET_WIDGET_H_
 #pragma once
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/native_widget_delegate.h"
 
-#if defined(OS_WIN)
-// Windows headers define macros for these function names which screw with us.
-#if defined(IsMaximized)
-#undef IsMaximized
-#endif
-#if defined(IsMinimized)
-#undef IsMinimized
-#endif
-#endif
-
 namespace gfx {
 class Canvas;
 class Path;
 class Point;
 class Rect;
 }
 
 namespace ui {
 class Accelerator;
 class Compositor;
@@ skipping 184 matching lines @@
   // Hides the widget then closes it after a return to the message loop.
   virtual void Close();
 
   // TODO(beng): Move off public API.
   // Closes the widget immediately. Compare to |Close|. This will destroy the
   // window handle associated with this Widget, so should not be called from
   // any code that expects it to be valid beyond this call.
   void CloseNow();
 
   // Shows or hides the widget, without changing activation state.
-  virtual void Show();
+  void Show();
   void Hide();
 
-  // Activates the widget, assuming it already exists and is visible.
-  void Activate();
-
-  // Deactivates the widget, making the next window in the Z order the active
-  // window.
-  void Deactivate();
-
-  // Returns whether the Widget is the currently active window.
-  virtual bool IsActive() const;
-
-  // Sets the widget to be on top of all other widgets in the windowing system.
-  void SetAlwaysOnTop(bool on_top);
-
-  // Maximizes/minimizes/restores the window.
-  void Maximize();
-  void Minimize();
-  void Restore();
-
-  // Whether or not the window is maximized or minimized.
-  virtual bool IsMaximized() const;
-  bool IsMinimized() const;
-
   // Sets the opacity of the widget. This may allow widgets behind the widget
   // in the Z-order to become visible, depending on the capabilities of the
   // underlying windowing system. Note that the caller must then schedule a
   // repaint to allow this change to take effect.
   void SetOpacity(unsigned char opacity);
 
+  // Sets the widget to be on top of all other widgets in the windowing system.
+  void SetAlwaysOnTop(bool on_top);
+
   // Returns the View at the root of the View hierarchy contained by this
   // Widget.
   View* GetRootView();
 
   // A secondary widget is one that is automatically closed (via Close()) when
   // all non-secondary widgets are closed.
   // Default is true.
   // TODO(beng): This is an ugly API, should be handled implicitly via
   //             transience.
   void set_is_secondary_widget(bool is_secondary_widget) {
     is_secondary_widget_ = is_secondary_widget;
   }
   bool is_secondary_widget() const { return is_secondary_widget_; }
 
   // Returns whether the Widget is visible to the user.
-  virtual bool IsVisible() const;
+  bool IsVisible() const;
+
+  // Returns whether the Widget is the currently active window.
+  bool IsActive() const;
 
   // Returns whether the Widget is customized for accessibility.
   bool IsAccessibleWidget() const;
 
   // Returns the ThemeProvider that provides theme resources for this Widget.
   virtual ThemeProvider* GetThemeProvider() const;
 
   // Returns the FocusManager for this widget.
   // Note that all widgets in a widget hierarchy share the same focus manager.
   // TODO(beng): remove virtual.
@@ skipping 153 matching lines @@
 
   // See set_is_secondary_widget().
   bool is_secondary_widget_;
 
   DISALLOW_COPY_AND_ASSIGN(Widget);
 };
 
 }  // namespace views
 
 #endif // VIEWS_WIDGET_WIDGET_H_