Allow offset for secondary display position in chrome://settings/display.

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"
@@ skipping 232 matching lines @@
 
   // 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 89 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);
 
@@ skipping 208 matching lines @@
   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