Move the concept of Activation to the Shell.

ui/aura/root_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_ROOT_WINDOW_H_
 #define UI_AURA_ROOT_WINDOW_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
@@ skipping 39 matching lines @@
   static void DeleteInstance();
 
   static void set_use_fullscreen_host_window(bool use_fullscreen) {
     use_fullscreen_host_window_ = use_fullscreen;
   }
 
   ui::Compositor* compositor() { return compositor_.get(); }
   gfx::Point last_mouse_location() const { return last_mouse_location_; }
   gfx::NativeCursor last_cursor() const { return last_cursor_; }
   StackingClient* stacking_client() { return stacking_client_.get(); }
-  Window* active_window() { return active_window_; }
   Window* mouse_pressed_handler() { return mouse_pressed_handler_; }
   Window* capture_window() { return capture_window_; }
   ScreenAura* screen() { return screen_; }
 
   void SetStackingClient(StackingClient* stacking_client);
 
   // Shows the root window host.
   void ShowRootWindow();
 
   // Sets the size of the root window.
@@ skipping 17 matching lines @@
 
   // Handles a touch event. Returns true if handled.
   bool DispatchTouchEvent(TouchEvent* event);
 
   // Called when the host changes size.
   void OnHostResized(const gfx::Size& size);
 
   // Called when the native screen's resolution changes.
   void OnNativeScreenResized(const gfx::Size& size);
 
-  // Sets the active window to |window| and the focused window to |to_focus|.
-  // If |to_focus| is NULL, |window| is focused. Does nothing if |window| is
-  // NULL.
-  void SetActiveWindow(Window* window, Window* to_focus);
-
-  // Activates the topmost window. Does nothing if the topmost window is already
-  // active.
-  void ActivateTopmostWindow();
-
-  // Deactivates |window| and activates the topmost window. Does nothing if
-  // |window| is not a topmost window, or there are no other suitable windows to
-  // activate.
-  void Deactivate(Window* window);
-
   // Invoked when |window| is initialized.
   void WindowInitialized(Window* window);
 
   // Invoked when |window| is being destroyed.
   void WindowDestroying(Window* window);
 
   // Returns the root window's dispatcher. The result should only be passed to
   // MessageLoopForUI::RunWithDispatcher() or
   // MessageLoopForUI::RunAllPendingWithDispatcher(), or used to dispatch
   // an event by |Dispatch(const NativeEvent&)| on it. It must never be stored.
   MessageLoop::Dispatcher* GetDispatcher();
 
   // Add/remove observer.
-  void AddObserver(RootWindowObserver* observer);
-  void RemoveObserver(RootWindowObserver* observer);
+  void AddRootWindowObserver(RootWindowObserver* observer);
+  void RemoveRootWindowObserver(RootWindowObserver* observer);
 
   // Are any mouse buttons currently down?
   bool IsMouseButtonDown() const;
 
   // Posts |native_event| to the platform's event queue.
   void PostNativeEvent(const base::NativeEvent& native_event);
 
   // Converts |point| from the root window's coordinate system to native
   // screen's.
   void ConvertPointToNativeScreen(gfx::Point* point) const;
@@ skipping 64 matching lines @@
   static RootWindow* instance_;
 
   // If set before the RootWindow is created, the host window will cover the
   // entire screen.  Note that this can still be overridden via the
   // switches::kAuraHostWindowSize flag.
   static bool use_fullscreen_host_window_;
 
   // Used to schedule painting.
   base::WeakPtrFactory<RootWindow> schedule_paint_factory_;
 
-  Window* active_window_;
-
   // Last location seen in a mouse event.
   gfx::Point last_mouse_location_;
 
   // ui::EventFlags containing the current state of the mouse buttons.
   int mouse_button_flags_;
 
   // Last cursor set.  Used for testing.
   gfx::NativeCursor last_cursor_;
 
-  // Are we in the process of being destroyed? Used to avoid processing during
-  // destruction.
-  bool in_destructor_;
-
   ObserverList<RootWindowObserver> observers_;
 
   ScreenAura* screen_;
 
   // The capture window. When not-null, this window receives all the mouse and
   // touch events.
   Window* capture_window_;
 
   Window* mouse_pressed_handler_;
   Window* mouse_moved_handler_;
   Window* focused_window_;
   Window* touch_event_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindow);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_ROOT_WINDOW_H_