Allow storing display preferences per device.

chrome/browser/chromeos/preferences.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 "chrome/browser/chromeos/preferences.h"
 
-#include "ash/display/display_controller.h"
-#include "ash/shell.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
 #include "base/i18n/time_formatting.h"
 #include "base/metrics/histogram.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/prefs/pref_member.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/display/display_preferences.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/system/drm_settings.h"
 #include "chrome/browser/chromeos/system/input_device_settings.h"
 #include "chrome/browser/chromeos/system/power_manager_settings.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/download/download_util.h"
@@ skipping 14 matching lines @@
 // TODO(achuith): Use a cmd-line flag + use flags for this instead.
 bool IsLumpy() {
   std::string board;
   system::StatisticsProvider::GetInstance()->GetMachineStatistic(
       "CHROMEOS_RELEASE_BOARD", &board);
   return StartsWithASCII(board, "lumpy", false);
 }
 
 }  // namespace
 
-using ash::internal::DisplayController;
-
 static const char kFallbackInputMethodLocale[] = "en-US";
 
 Preferences::Preferences()
     : prefs_(NULL),
       input_method_manager_(input_method::InputMethodManager::GetInstance()) {
 }
 
 Preferences::Preferences(input_method::InputMethodManager* input_method_manager)
     : input_method_manager_(input_method_manager) {
 }
@@ skipping 177 matching lines @@
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterIntegerPref(prefs::kLanguageXkbAutoRepeatInterval,
                              language_prefs::kXkbAutoRepeatIntervalInMs,
                              PrefService::UNSYNCABLE_PREF);
 
   // Screen lock default to off.
   prefs->RegisterBooleanPref(prefs::kEnableScreenLock,
                              false,
                              PrefService::SYNCABLE_PREF);
 
-  // Secondary display layout.
-  prefs->RegisterIntegerPref(prefs::kSecondaryDisplayLayout,
-                             static_cast<int>(DisplayController::RIGHT),
-                             PrefService::UNSYNCABLE_PREF);
-  // The offset of the secondary display position from the primary display.
-  prefs->RegisterIntegerPref(prefs::kSecondaryDisplayOffset,
-                             0,
-                             PrefService::UNSYNCABLE_PREF);
-
   // Mobile plan notifications default to on.
   prefs->RegisterBooleanPref(prefs::kShowPlanNotifications,
                              true,
                              PrefService::SYNCABLE_PREF);
 
   // 3G first-time usage promo will be shown at least once.
   prefs->RegisterBooleanPref(prefs::kShow3gPromoNotification,
                              true,
                              PrefService::UNSYNCABLE_PREF);
 
@@ skipping 13 matching lines @@
 
   // TODO(wad): Once UI is connected, a final default can be set. At that point
   // change this pref from UNSYNCABLE to SYNCABLE.
   prefs->RegisterBooleanPref(prefs::kEnableCrosDRM,
                              true,
                              PrefService::UNSYNCABLE_PREF);
 
   prefs->RegisterBooleanPref(prefs::kExternalStorageDisabled,
                              false,
                              PrefService::UNSYNCABLE_PREF);
+
+  RegisterDisplayPrefs(prefs);
 }
 
 void Preferences::InitUserPrefs(PrefService* prefs) {
   prefs_ = prefs;
 
   tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, this);
   three_finger_click_enabled_.Init(prefs::kEnableTouchpadThreeFingerClick,
       prefs, this);
   natural_scroll_.Init(prefs::kNaturalScroll, prefs, this);
   accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled, prefs, this);
@@ skipping 54 matching lines @@
   }
   xkb_auto_repeat_enabled_.Init(
       prefs::kLanguageXkbAutoRepeatEnabled, prefs, this);
   xkb_auto_repeat_delay_pref_.Init(
       prefs::kLanguageXkbAutoRepeatDelay, prefs, this);
   xkb_auto_repeat_interval_pref_.Init(
       prefs::kLanguageXkbAutoRepeatInterval, prefs, this);
 
   enable_screen_lock_.Init(prefs::kEnableScreenLock, prefs, this);
 
-  secondary_display_layout_.Init(prefs::kSecondaryDisplayLayout, prefs, this);
-  secondary_display_offset_.Init(prefs::kSecondaryDisplayOffset, prefs, this);
-
   enable_drm_.Init(prefs::kEnableCrosDRM, prefs, this);
 }
 
 void Preferences::Init(PrefService* prefs) {
   InitUserPrefs(prefs);
 
   // Initialize preferences to currently saved state.
   NotifyPrefChanged(NULL);
 
   // If a guest is logged in, initialize the prefs as if this is the first
   // login.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) {
     LoginUtils::Get()->SetFirstLoginPrefs(prefs);
   }
+
+  NotifyDisplayPrefChanged(prefs);
 }
 
 void Preferences::InitUserPrefsForTesting(PrefService* prefs) {
   InitUserPrefs(prefs);
 }
 
 void Preferences::SetInputMethodListForTesting() {
   SetInputMethodList();
 }
 
@@ skipping 183 matching lines @@
           mozc_integer_prefs_[i].GetValue());
     }
   }
 
   // Init or update power manager config.
   if (!pref_name || *pref_name == prefs::kEnableScreenLock) {
     system::power_manager_settings::EnableScreenLock(
         enable_screen_lock_.GetValue());
   }
 
-  if (!pref_name || *pref_name == prefs::kSecondaryDisplayLayout) {
-    int layout = secondary_display_layout_.GetValue();
-    if (static_cast<int>(DisplayController::TOP) <= layout &&
-        layout <= static_cast<int>(DisplayController::LEFT)) {
-      ash::Shell::GetInstance()->display_controller()->
-          SetSecondaryDisplayLayout(
-              static_cast<DisplayController::SecondaryDisplayLayout>(layout));
-    }
-  }
-
-  if (!pref_name || *pref_name == prefs::kSecondaryDisplayOffset) {
-    ash::Shell::GetInstance()->display_controller()->
-        SetSecondaryDisplayOffset(secondary_display_offset_.GetValue());
-  }
-
   // Init or update protected content (DRM) support.
   if (!pref_name || *pref_name == prefs::kEnableCrosDRM) {
     system::ToggleDrm(enable_drm_.GetValue());
   }
 
   // Change the download directory to the default value if a GData directory is
   // selected and GData is disabled.
   if (!pref_name || *pref_name == prefs::kDisableGData) {
     if (disable_gdata_.GetValue()) {
       const FilePath download_path =
@@ skipping 97 matching lines @@
 
   input_method::AutoRepeatRate rate;
   rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue();
   rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue();
   DCHECK(rate.initial_delay_in_ms > 0);
   DCHECK(rate.repeat_interval_in_ms > 0);
   input_method::XKeyboard::SetAutoRepeatRate(rate);
 }
 
 }  // namespace chromeos