Revert 114095 - Move the concept of Activation to the 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 <string>
@@ skipping 74 matching lines @@
 
   // Changes the visibility of the window.
   void Show();
   void Hide();
   // Returns true if this window and all its ancestors are visible.
   bool IsVisible() const;
 
   // Returns the window's bounds in screen coordinates.
   gfx::Rect GetScreenBounds() const;
 
+  // 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;
 
   virtual void SetTransform(const ui::Transform& transform);
 
   // Assigns a LayoutManager to size and place child windows.
   // The Window takes ownership of the LayoutManager.
   void SetLayoutManager(LayoutManager* layout_manager);
   LayoutManager* layout_manager() { return layout_manager_.get(); }
 
@@ skipping 15 matching lines @@
   // the root window.
   void SetParent(Window* parent);
 
   // Stacks the specified child of this Window at the front of the z-order.
   void StackChildAtTop(Window* child);
 
   // Stacks |child| above |other|.  Does nothing if |child| is already above
   // |other|.
   void StackChildAbove(Window* child, Window* other);
 
+  // Returns true if this window can be activated.
+  bool CanActivate() const;
+
   // Tree operations.
   // TODO(beng): Child windows are currently not owned by the hierarchy. We
   //             should change this.
   void AddChild(Window* child);
   void RemoveChild(Window* child);
 
   const Windows& children() const { return children_; }
 
   // Returns true if this Window contains |other| somewhere in its children.
   bool Contains(const Window* other) const;
@@ skipping 90 matching lines @@
   void SetCapture();
 
   // Releases a mouse capture.
   void ReleaseCapture();
 
   // Returns true if this window has a mouse capture.
   bool HasCapture();
 
   // 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. The caller is
-  // responsible for the lifetime of any object set as a property on the Window.
+  // 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 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;
@@ skipping 88 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_