Allow storing display preferences per device.

ash/shell.cc

 // 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.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/focus_manager_factory.h"
@@ skipping 167 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, public:
 
 Shell::Shell(ShellDelegate* delegate)
     : screen_(new ScreenAsh),
       active_root_window_(NULL),
       env_filter_(NULL),
       delegate_(delegate),
 #if defined(OS_CHROMEOS)
       output_configurator_(new chromeos::OutputConfigurator(
-          internal::DisplayController::IsExtendedDesktopEnabled())),
+          DisplayController::IsExtendedDesktopEnabled())),
       output_configurator_animation_(
           new internal::OutputConfiguratorAnimation()),
 #endif  // defined(OS_CHROMEOS)
       shelf_(NULL),
       panel_layout_manager_(NULL),
       status_area_widget_(NULL),
       browser_context_(NULL) {
   gfx::Screen::SetInstance(screen_);
   ui_controls::InstallUIControlsAura(internal::CreateUIControls());
 #if defined(OS_CHROMEOS)
@@ skipping 166 matching lines @@
   // Pass ownership of the filter to the Env.
   aura::Env::GetInstance()->SetEventFilter(env_filter_);
 
   cursor_manager_.set_delegate(this);
 
   focus_manager_.reset(new aura::FocusManager);
   activation_controller_.reset(
       new internal::ActivationController(focus_manager_.get()));
 
   screen_position_controller_.reset(new internal::ScreenPositionController);
-  display_controller_.reset(new internal::DisplayController);
+  display_controller_.reset(new DisplayController);
   display_controller_->InitPrimaryDisplay();
   aura::RootWindow* root_window = display_controller_->GetPrimaryRootWindow();
   active_root_window_ = root_window;
 
 #if !defined(OS_MACOSX)
   nested_dispatcher_controller_.reset(new NestedDispatcherController);
   accelerator_controller_.reset(new AcceleratorController);
 #endif
   shell_context_menu_.reset(new internal::ShellContextMenu);
 
@@ skipping 29 matching lines @@
       new internal::RootWindowController(root_window);
   root_window_controller->CreateContainers();
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   if (command_line->HasSwitch(switches::kAshTouchHud)) {
     touch_observer_hud_.reset(new internal::TouchObserverHUD);
     AddEnvEventFilter(touch_observer_hud_.get());
   }
 
-  if (internal::DisplayController::IsExtendedDesktopEnabled()) {
+  if (DisplayController::IsExtendedDesktopEnabled()) {
     mouse_cursor_filter_.reset(
         new internal::MouseCursorEventFilter(display_controller_.get()));
     AddEnvEventFilter(mouse_cursor_filter_.get());
   }
 
   // Create Controllers that may need root window.
   // TODO(oshima): Move as many controllers before creating
   // RootWindowController as possible.
   stacking_controller_.reset(new internal::StackingController);
   visibility_controller_.reset(new internal::VisibilityController);
@@ skipping 226 matching lines @@
   return status_area_widget_->system_tray();
 }
 
 int Shell::GetGridSize() const {
   return
       GetPrimaryRootWindowController()->workspace_controller()->GetGridSize();
 }
 
 void Shell::InitRootWindowForSecondaryDisplay(aura::RootWindow* root) {
   root->set_focus_manager(focus_manager_.get());
-  if (internal::DisplayController::IsExtendedDesktopEnabled()) {
+  if (DisplayController::IsExtendedDesktopEnabled()) {
     internal::RootWindowController* controller =
         new internal::RootWindowController(root);
     controller->CreateContainers();
     InitRootWindowController(controller);
     controller->root_window_layout()->OnWindowResized();
     desktop_background_controller_->OnRootWindowAdded(root);
     root->ShowRootWindow();
     // Activate new root for testing.
     active_root_window_ = root;
   } else {
@@ skipping 109 matching lines @@
 }
 
 void Shell::ShowCursor(bool visible) {
   RootWindowList root_windows = GetAllRootWindows();
   for (RootWindowList::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter)
     (*iter)->ShowCursor(visible);
 }
 
 }  // namespace ash