Merge 195552 "Restore focus/activation after the root window has..."

ash/display/display_controller.h

Index: ash/display/display_controller.h
===================================================================
--- ash/display/display_controller.h	(revision 197500)
+++ ash/display/display_controller.h	(working copy)
@@ -31,6 +31,7 @@
 namespace ash {
 namespace internal {
 class DisplayManager;
+class FocusActivationStore;
 class RootWindowController;
 }
 
@@ -258,6 +259,8 @@
   // display.
   aura::RootWindow* primary_root_window_for_replace_;
 
+  scoped_ptr<internal::FocusActivationStore> focus_activation_store_;
+
   DISALLOW_COPY_AND_ASSIGN(DisplayController);
 };