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

ash/display/display_controller.h

 // 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_DISPLAY_DISPLAY_CONTROLLER_H_
 #define ASH_DISPLAY_DISPLAY_CONTROLLER_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 13 matching lines @@
 }
 
 namespace base {
 class Value;
 template <typename T> class JSONValueConverter;
 }
 
 namespace ash {
 namespace internal {
 class DisplayManager;
+class FocusActivationStore;
 class RootWindowController;
 }
 
 typedef std::pair<int64, int64> DisplayIdPair;
 
 struct ASH_EXPORT DisplayLayout {
   // Layout options where the secondary display should be positioned.
   enum Position {
     TOP,
     RIGHT,
@@ skipping 207 matching lines @@
   // The ID of the display which should be primary when connected.
   // kInvalidDisplayID if no such preference is specified.
   int64 desired_primary_display_id_;
 
   ObserverList<Observer> observers_;
 
   // Store the primary root window temporarily while replacing
   // display.
   aura::RootWindow* primary_root_window_for_replace_;
 
+  scoped_ptr<internal::FocusActivationStore> focus_activation_store_;
+
   DISALLOW_COPY_AND_ASSIGN(DisplayController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_CONTROLLER_H_