Temporarily remember the primary root window while replacing the display.

ash/display/display_controller.h

Index: ash/display/display_controller.h
diff --git a/ash/display/display_controller.h b/ash/display/display_controller.h
index 67df6d3dc6b31e8b5ea8d97b40c3ff791729d6ba..22d92bd6e754ca94e463a5d270570715c4a451a7 100644
--- a/ash/display/display_controller.h
+++ b/ash/display/display_controller.h
@@ -181,6 +181,10 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver {
 
   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);
 };