Move maximize/fullscreen/restore to shell

ui/aura/window.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 UI_AURA_WINDOW_H_
 #define UI_AURA_WINDOW_H_
 #pragma once
 
 #include <map>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/string16.h"
 #include "ui/base/events.h"
-#include "ui/base/ui_base_types.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/window_types.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
 #include "ui/gfx/compositor/layer_delegate.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 
 class SkCanvas;
 
@@ skipping 59 matching lines @@
   // The Window does not own this object.
   void set_user_data(void* user_data) { user_data_ = user_data; }
   void* user_data() const { return user_data_; }
 
   // Changes the visibility of the window.
   void Show();
   void Hide();
   // Returns true if this window and all its ancestors are visible.
   bool IsVisible() const;
 
-  // Maximize the window.
-  void Maximize();
-
-  // Go into fullscreen mode.
-  void Fullscreen();
-
-  // Restore the window to its original bounds.
-  void Restore();
-
   // Returns the window's bounds in screen coordinates.
   gfx::Rect GetScreenBounds() const;
 
-  // Returns the window's show state.
-  ui::WindowShowState show_state() const { return show_state_; }
-
   // Activates this window. Only top level windows can be activated. Requests
   // to activate a non-top level window are ignored.
   void Activate();
 
   // Deactivates this window. Only top level windows can be
   // deactivated. Requests to deactivate a non-top level window are ignored.
   void Deactivate();
 
   // Returns true if this window is active.
   bool IsActive() const;
@@ skipping 134 matching lines @@
   // Releases a mouse capture.
   void ReleaseCapture();
 
   // Returns true if this window has a mouse capture.
   bool HasCapture();
 
   // Returns the first ancestor whose parent window returns true from
   // IsToplevelWindowContainer.
   Window* GetToplevelWindow();
 
-  // Returns true if this window is fullscreen or contains a fullscreen window.
-  bool IsOrContainsFullscreenWindow() const;
-
-  // Sets the window property |value| for given |name|. Setting NULL
+  // Sets the window property |value| for given |name|. Setting NULL or 0
   // removes the property. It uses |ui::ViewProp| to store the property.
   // Please see the description of |prop_map_| for more details.
   void SetProperty(const char* name, void* value);
+  void SetIntProperty(const char* name, int value);
 
-  // Returns the window property for given |name|.  Returns NULL if
+  // Returns the window property for given |name|.  Returns NULL or 0 if
   // the property does not exist.
+  // TODO(oshima): Returning 0 for non existing property is problematic.
+  // Fix ViewProp to be able to tell if the property exists and
+  // change it to -1.
   void* GetProperty(const char* name) const;
+  int GetIntProperty(const char* name) const;
 
  protected:
   // Returns the desktop or NULL if we aren't yet attached to a desktop.
   virtual Desktop* GetDesktop();
 
  private:
   friend class LayoutManager;
 
   // Changes the bounds of the window without condition.
   void SetBoundsInternal(const gfx::Rect& new_bounds);
 
   // Updates the visible state of the layer, but does not make visible-state
   // specific changes. Called from Show()/Hide().
   void SetVisible(bool visible);
 
   // Schedules a paint for the Window's entire bounds.
   void SchedulePaint();
 
   // This window is currently stopping event propagation for any windows behind
   // it in the z-order.
   bool StopsEventPropagation() const;
 
-  // Update the show state and restore bounds. Returns false
-  // if |new_show_state| is same as current show state.
-  bool UpdateShowStateAndRestoreBounds(ui::WindowShowState new_show_state);
-
   // Gets a Window (either this one or a subwindow) containing |local_point|.
   // If |return_tightest| is true, returns the tightest-containing (i.e.
   // furthest down the hierarchy) Window containing the point; otherwise,
   // returns the loosest.  If |for_event_handling| is true, then hit-test masks
   // and StopsEventPropagation() are honored; otherwise, only bounds checks are
   // performed.
   Window* GetWindowForPoint(const gfx::Point& local_point,
                             bool return_tightest,
                             bool for_event_handling);
 
   // Overridden from ui::LayerDelegate:
   virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE;
   virtual void OnLayerAnimationEnded(
       const ui::LayerAnimationSequence* animation) OVERRIDE;
 
   WindowType type_;
 
   WindowDelegate* delegate_;
 
-  ui::WindowShowState show_state_;
-
   // The original bounds of a maximized/fullscreen window.
   gfx::Rect restore_bounds_;
 
   // The minimum size of the window a user can resize to.
   gfx::Size minimum_size_;
 
   scoped_ptr<ui::Layer> layer_;
 
   // The Window's parent.
   Window* parent_;
@@ skipping 26 matching lines @@
   // TODO(oshima): Consolidcate ViewProp and aura::window property
   // implementation.
   std::map<const char*, void*> prop_map_;
 
   DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_H_