Allow storing display preferences per device.

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 8427e27901c1180cbe6ba6c4bc1d7e97ec102179..e0c0cae7526975a51e9a6b97a4d0b4dda6f631e3 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -61,6 +61,7 @@ namespace ash {
 class AcceleratorController;
 class CapsLockDelegate;
 class DesktopBackgroundController;
+class DisplayController;
 class HighContrastController;
 class Launcher;
 class NestedDispatcherController;
@@ -80,7 +81,6 @@ class AcceleratorFilter;
 class ActivationController;
 class AppListController;
 class CaptureController;
-class DisplayController;
 class DragDropController;
 class EventRewriterEventFilter;
 class FocusCycler;
@@ -274,7 +274,7 @@ class ASH_EXPORT Shell : ash::CursorDelegate {
   internal::FocusCycler* focus_cycler() {
     return focus_cycler_.get();
   }
-  internal::DisplayController* display_controller() {
+  DisplayController* display_controller() {
     return display_controller_.get();
   }
   internal::MouseCursorEventFilter* mouse_cursor_filter() {
@@ -436,7 +436,7 @@ class ASH_EXPORT Shell : ash::CursorDelegate {
   scoped_ptr<VideoDetector> video_detector_;
   scoped_ptr<WindowCycleController> window_cycle_controller_;
   scoped_ptr<internal::FocusCycler> focus_cycler_;
-  scoped_ptr<internal::DisplayController> display_controller_;
+  scoped_ptr<DisplayController> display_controller_;
   scoped_ptr<HighContrastController> high_contrast_controller_;
   scoped_ptr<internal::MagnificationController> magnification_controller_;
   scoped_ptr<aura::FocusManager> focus_manager_;