Merge 174008

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 161 matching lines @@
 
   // Per-device display layout.
   std::map<int64, DisplayLayout> secondary_layouts_;
 
   // 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_;
+
   DISALLOW_COPY_AND_ASSIGN(DisplayController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_CONTROLLER_H_