Introduce ChromeZoomLevelPref, make zoom level prefs independent of profile prefs.

chrome/browser/profiles/profile.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/profiles/profile.h"
 
 #include <string>
 
 #include "base/prefs/pref_service.h"
 #include "build/build_config.h"
@@ skipping 42 matching lines @@
 
 // static
 Profile* Profile::FromWebUI(content::WebUI* web_ui) {
   return FromBrowserContext(web_ui->GetWebContents()->GetBrowserContext());
 }
 
 TestingProfile* Profile::AsTestingProfile() {
   return NULL;
 }
 
+chrome::ChromeZoomLevelPrefs* Profile::GetZoomLevelPrefs() {
+  return NULL;
+}
+
 Profile::Delegate::~Delegate() {
 }
 
 // static
 const char Profile::kProfileKey[] = "__PROFILE__";
 
 // static
 void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kSearchSuggestEnabled,
@@ skipping 56 matching lines @@
 #if defined(ENABLE_EXTENSIONS)
   registry->RegisterBooleanPref(
       extensions::pref_names::kAlertsInitialized,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 #endif
   registry->RegisterStringPref(
       prefs::kSelectFileLastDirectory,
       std::string(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  // TODO(wjmaclean): remove the following pref once migration to per-partition
+  // zoom is complete.
   registry->RegisterDoublePref(
+      prefs::kProfileDefaultZoomLevel,

[Bernhard Bauer, 2014/10/01 15:09:14]

This is what I meant in my email: You're registering a preference which is a
prefix of another preference. That is very dangerous and might break at any
time. For example, someone could write a dictionary to
profile.default_zoom_level which doesn't contain a double for the key "0". Then
when you're trying to read profile.default_zoom_level.0, you'll get back the
wrong type, which will DCHECK. I think you'll need to implement the type
checking and default value logic anyway for arbitrary subdictionaries under
profile.default_zoom_level, so registering profile.default_zoom_level.0 doesn't
get you anything you couldn't get otherwise.

[wjmaclean, 2014/10/01 20:32:59]

I assume this comment was intended for line 151 (below) ... this line of code is
part of the legacy prefs for default zoom level, with a re-name of the constant
(prefs::kProfileDefaultZoomLevel).

But I understand that I cannot register both prefs::kDefaultZoomLevel and
prefs::kDefaultZoomLevel + ".0".

The main reason that I wanted to register partition.default_zoom_level.0 was to
get notifications if somewhere else in the code modifies this value (this is the
default zoom level for the main browser window). So *not* registering this means
I will have to add custom notifications for this value.

+      0.0,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  std::string default_zoom_level_path(prefs::kDefaultZoomLevel);
+  default_zoom_level_path.append(".0");
+  registry->RegisterDoublePref(
+      default_zoom_level_path.c_str(),
+      0.0,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterDictionaryPref(
       prefs::kDefaultZoomLevel,
-      0.0,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  // TODO(wjmaclean): remove the following pref once migration to per-partition
+  // zoom is complete.
+  registry->RegisterDictionaryPref(
+      prefs::kProfilePerHostZoomLevels,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterDictionaryPref(
       prefs::kPerHostZoomLevels,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterStringPref(
       prefs::kDefaultApps,
       "install",
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kSpeechRecognitionFilterProfanities,
@@ skipping 91 matching lines @@
         content::NotificationService::NoDetails());
   }
 }
 
 bool ProfileCompare::operator()(Profile* a, Profile* b) const {
   DCHECK(a && b);
   if (a->IsSameProfile(b))
     return false;
   return a->GetOriginalProfile() < b->GetOriginalProfile();
 }