Hook up the FocusController behind a flag.
http://crbug.com/162100
[email protected]
Review URL: https://codereview.chromium.org/11421194
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170752 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ash/shell.h b/ash/shell.h
index 1d25ad3..71181bca 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -30,6 +30,7 @@
class RootWindow;
class Window;
namespace client {
+class ActivationClient;
class FocusClient;
class StackingClient;
class UserActionClient;
@@ -508,6 +509,7 @@
scoped_ptr<PartialMagnificationController> partial_magnification_controller_;
scoped_ptr<aura::client::FocusClient> focus_client_;
scoped_ptr<aura::client::UserActionClient> user_action_client_;
+ aura::client::ActivationClient* activation_client_;
scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_;
scoped_ptr<internal::ScreenPositionController> screen_position_controller_;
scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_;
