Use persistent ID/names for displays.

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 7bf18246dbbe9c7b3dd315d0ea01891381b35814..a151a2a07d9af275bfbe54baa7d4a82aabdc9111 100644
--- a/ash/display/display_controller.h
+++ b/ash/display/display_controller.h
@@ -95,11 +95,14 @@ class ASH_EXPORT DisplayController : public aura::DisplayObserver {
 
   // Creates a root window for |display| and stores it in the |root_windows_|
   // map.
-  aura::RootWindow* AddRootWindowForDisplay(const gfx::Display& display);
+  // TODO(oshima): remove |is_primary| when non extended desktop mode is
+  // removed.
+  aura::RootWindow* AddRootWindowForDisplay(const gfx::Display& display,
+                                            bool is_primary);
 
   void UpdateDisplayBoundsForLayout();
 
-  std::map<int, aura::RootWindow*> root_windows_;
+  std::map<int64, aura::RootWindow*> root_windows_;
 
   SecondaryDisplayLayout secondary_display_layout_;