Allow storing display preferences per device.

chrome/browser/chromeos/display_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/display_preferences.h"
+
+#include "ash/display/display_controller.h"
+#include "ash/shell.h"
+#include "base/string16.h"
+#include "base/string_util.h"
+#include "base/values.h"
+#include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/prefs/scoped_user_pref_update.h"
+#include "chrome/common/pref_names.h"
+#include "googleurl/src/url_canon.h"
+#include "googleurl/src/url_util.h"
+#include "ui/aura/display_manager.h"
+#include "ui/aura/env.h"
+#include "ui/gfx/display.h"
+
+namespace chromeos {
+
+namespace {
+// Replaces dot "." by "%2E" since it's the path separater of base::Value.
+void EscapeDisplayName(const std::string& name, std::string* escaped) {
+  DCHECK(escaped);
+  std::string middle;
+  ReplaceChars(name, "%", "%25", &middle);
+  ReplaceChars(middle, ".", "%2E", escaped);
+}
+
+// Unescape %-encoded characters.
+std::string UnescapeDisplayName(const std::string& name) {
+  url_canon::RawCanonOutputT<char16> decoded;
+  url_util::DecodeURLEscapeSequences(name.data(), name.size(), &decoded);
+  // Display names are ASCII-only.
+  return UTF16ToASCII(string16(decoded.data(), decoded.length()));
+}
+
+}  // namespace
+
+using ash::internal::DisplayLayout;
+
+void RegisterDisplayPrefs(PrefService* pref_service) {
+  // The default secondary display layout.
+  pref_service->RegisterIntegerPref(prefs::kSecondaryDisplayLayout,
+                                    static_cast<int>(DisplayLayout::RIGHT),
+                                    PrefService::UNSYNCABLE_PREF);
+  // The default offset of the secondary display position from the primary
+  // display.
+  pref_service->RegisterIntegerPref(prefs::kSecondaryDisplayOffset,
+                                    0,
+                                    PrefService::UNSYNCABLE_PREF);
+  // Per-display preference.
+  pref_service->RegisterDictionaryPref(prefs::kSecondaryDisplays,
+                                       PrefService::UNSYNCABLE_PREF);
+}
+
+void SetDisplayLayoutPref(PrefService* pref_service,
+                          const gfx::Display& display, int layout, int offset) {
+  {
+    DictionaryPrefUpdate update(pref_service, prefs::kSecondaryDisplays);
+    DisplayLayout display_layout(
+        static_cast<DisplayLayout::Position>(layout), offset);
+
+    aura::DisplayManager* display_manager =
+        aura::Env::GetInstance()->display_manager();
+    std::string name;
+    for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
+      if (display_manager->GetDisplayAt(i)->id() == display.id()) {
+        EscapeDisplayName(display_manager->GetDisplayNameAt(i), &name);
+        break;
+      }
+    }
+
+    DCHECK(!name.empty());
+
+    base::DictionaryValue* pref_data = update.Get();
+    scoped_ptr<base::DictionaryValue>layout_value(
+        new base::DictionaryValue());
+    if (pref_data->HasKey(name)) {
+      base::Value* value = NULL;
+      base::DictionaryValue* dict_value = NULL;
+      if (pref_data->Get(name, &value) && value != NULL &&
+          value->GetAsDictionary(&dict_value) && dict_value != NULL) {
+        layout_value.reset(dict_value->DeepCopy());
+      }
+    }
+    if (display_layout.GetValue(layout_value.get())) {
+      pref_data->Set(name, layout_value.release());
+    }

[oshima, 2012/08/27 23:00:46]

nuke {}

[Jun Mukai, 2012/08/28 08:12:42]

Done.

+  }
+
+  pref_service->SetInteger(prefs::kSecondaryDisplayLayout, layout);
+  pref_service->SetInteger(prefs::kSecondaryDisplayOffset, offset);
+
+  NotifyDisplayPrefChanged(pref_service);
+}
+
+void NotifyDisplayPrefChanged(PrefService* pref_service) {
+  ash::internal::DisplayController* display_controller =
+      ash::Shell::GetInstance()->display_controller();
+
+  DisplayLayout::Position default_position =
+      static_cast<DisplayLayout::Position>(pref_service->GetInteger(
+          prefs::kSecondaryDisplayLayout));
+  display_controller->SetSecondaryDisplayLayout(default_position);
+  int offset = pref_service->GetInteger(prefs::kSecondaryDisplayOffset);
+  display_controller->SetSecondaryDisplayOffset(offset);

[oshima, 2012/08/27 23:00:46]

sanity check these values.

[Jun Mukai, 2012/08/28 08:12:42]

Thanks.  I changed the code to accept "SetDefaultDisplayLayout" by specifying
DisplayLayout struct, rather than accepting each field of the struct.  Then the
DisplayLayout constructor checks the validity, so I think it's unnecessary to
check here.

+
+  const base::DictionaryValue* layouts = pref_service->GetDictionary(
+      prefs::kSecondaryDisplays);
+  for (base::DictionaryValue::key_iterator it = layouts->begin_keys();
+       it != layouts->end_keys(); ++it) {
+    const base::Value* value = NULL;

[oshima, 2012/08/27 23:00:46]

how this can be const?

[Jun Mukai, 2012/08/28 08:12:42]

 DictionaryValue::Get needs this const-ness.  I guess DictionaryValue returns
its internal pointer here and that's why.

+    if (!layouts->Get(*it, &value) || value == NULL)
+      continue;
+
+    display_controller->SetDisplayLayoutForName(
+        UnescapeDisplayName(*it), *value);
+  }
+}
+
+}  // namespace chromeos