Temporarily remember the primary root window while replacing the display.

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 163 matching lines @@
 
   // Per-device display layout.
   std::map<std::string, 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_;

[Daniel Erat, 2012/12/19 16:49:13]

can you store this in a scoped_ptr instead so it won't be leaked?

[oshima, 2012/12/19 16:59:51]

If it ever leaked, many bad things will happen, and will most likely causes
crash. I'd rather add CHECK where appropriate. What do you think?

[Daniel Erat, 2012/12/19 17:02:26]

Doesn't this get leaked if OnDisplayRemoved() is called but the
DisplayController is destroyed before OnDisplayAdded() is called to reclaim this
pointer?  Using scoped_ptr seems like it makes owership clearer.

+
   DISALLOW_COPY_AND_ASSIGN(DisplayController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_CONTROLLER_H_