Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2757)

Unified Diff: ash/wm/activation_controller.h

Issue 23874013: Remove old activation code and disable-focus-controller flags (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/wm/activation_controller.h
diff --git a/ash/wm/activation_controller.h b/ash/wm/activation_controller.h
deleted file mode 100644
index 11e09b98f6e17dd9daae79182a584915a5388d38..0000000000000000000000000000000000000000
--- a/ash/wm/activation_controller.h
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright (c) 2012 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 ASH_WM_ACTIVATION_CONTROLLER_H_
-#define ASH_WM_ACTIVATION_CONTROLLER_H_
-
-#include "ash/ash_export.h"
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "base/observer_list.h"
-#include "base/scoped_observer.h"
-#include "ui/aura/client/activation_client.h"
-#include "ui/aura/client/focus_change_observer.h"
-#include "ui/aura/env_observer.h"
-#include "ui/aura/window_observer.h"
-#include "ui/base/events/event_handler.h"
-
-namespace aura {
-namespace client {
-class ActivationChangeObserver;
-class FocusClient;
-}
-}
-
-namespace ash {
-namespace internal {
-
-class ActivationControllerDelegate;
-
-// Exported for unit tests.
-class ASH_EXPORT ActivationController
- : public aura::client::ActivationClient,
- public aura::WindowObserver,
- public aura::EnvObserver,
- public aura::client::FocusChangeObserver,
- public ui::EventHandler {
- public:
- // The ActivationController takes ownership of |delegate|.
- ActivationController(aura::client::FocusClient* focus_client,
- ActivationControllerDelegate* delegate);
- virtual ~ActivationController();
-
- // Returns true if |window| exists within a container that supports
- // activation. |event| is the event responsible for initiating the change, or
- // NULL if there is no event.
- static aura::Window* GetActivatableWindow(aura::Window* window,
- const ui::Event* event);
-
- // Overridden from aura::client::ActivationClient:
- virtual void AddObserver(
- aura::client::ActivationChangeObserver* observer) OVERRIDE;
- virtual void RemoveObserver(
- aura::client::ActivationChangeObserver* observer) OVERRIDE;
- virtual void ActivateWindow(aura::Window* window) OVERRIDE;
- virtual void DeactivateWindow(aura::Window* window) OVERRIDE;
- virtual aura::Window* GetActiveWindow() OVERRIDE;
- virtual aura::Window* GetActivatableWindow(aura::Window* window) OVERRIDE;
- virtual aura::Window* GetToplevelWindow(aura::Window* window) OVERRIDE;
- virtual bool OnWillFocusWindow(aura::Window* window,
- const ui::Event* event) OVERRIDE;
- virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE;
-
- // Overridden from aura::WindowObserver:
- virtual void OnWindowVisibilityChanged(aura::Window* window,
- bool visible) OVERRIDE;
- virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
-
- // Overridden from aura::EnvObserver:
- virtual void OnWindowInitialized(aura::Window* window) OVERRIDE;
-
- // Overridden from aura::client::FocusChangeObserver:
- virtual void OnWindowFocused(aura::Window* gained_focus,
- aura::Window* lost_focus) OVERRIDE;
-
- private:
- // Overridden from ui::EventHandler:
- virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
- virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
- virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
- virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
- virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
-
- // Implementation of ActivateWindow() with an Event.
- void ActivateWindowWithEvent(aura::Window* window,
- const ui::Event* event);
-
- // Shifts activation to the next window, ignoring |window|. Returns the next
- // window.
- aura::Window* ActivateNextWindow(aura::Window* window);
-
- // Returns the next window that should be activated, ignoring |ignore|.
- aura::Window* GetTopmostWindowToActivate(aura::Window* ignore) const;
-
- // Returns the next window that should be activated in |container| ignoring
- // the window |ignore|.
- aura::Window* GetTopmostWindowToActivateInContainer(
- aura::Window* container,
- aura::Window* ignore) const;
-
- // Called from the ActivationController's event handler implementation to
- // handle focus to the |event|'s target. Not all targets are focusable or
- // result in focus changes.
- void FocusWindowWithEvent(const ui::Event* event);
-
- aura::client::FocusClient* focus_client_;
-
- // True inside ActivateWindow(). Used to prevent recursion of focus
- // change notifications causing activation.
- bool updating_activation_;
-
- aura::Window* active_window_;
-
- ObserverList<aura::client::ActivationChangeObserver> observers_;
-
- ScopedObserver<aura::Window, aura::WindowObserver> observer_manager_;
-
- scoped_ptr<ActivationControllerDelegate> delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(ActivationController);
-};
-
-} // namespace internal
-} // namespace ash
-
-#endif // ASH_WM_ACTIVATION_CONTROLLER_H_

Powered by Google App Engine
This is Rietveld 408576698