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

chrome/browser/ui/prefs/prefs_tab_helper.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/ui/prefs/prefs_tab_helper.h"
 
 #include <string>
 
 #include "base/prefs/overlay_user_pref_store.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_preferences_util.h"
+#include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
+#include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/common/pref_font_webkit_names.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_names_util.h"
 #include "chrome/grit/locale_settings.h"
 #include "components/pref_registry/pref_registry_syncable.h"
+#include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/renderer_preferences.h"
 #include "content/public/common/web_preferences.h"
 #include "grit/platform_locale_settings.h"
 #include "third_party/icu/source/common/unicode/uchar.h"
 #include "third_party/icu/source/common/unicode/uscript.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES)
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #endif
@@ skipping 266 matching lines @@
     map = &prefs->cursive_font_family_map;
   else if (generic_family == "fantasy")
     map = &prefs->fantasy_font_family_map;
   else if (generic_family == "pictograph")
     map = &prefs->pictograph_font_family_map;
   else
     NOTREACHED() << "Unknown generic font family: " << generic_family;
   (*map)[script] = base::UTF8ToUTF16(pref_value);
 }
 
+double GetDefaultZoomLevel(const content::WebContents* web_contents) {
+  const ZoomController* zoom_controller =
+      ZoomController::FromWebContents(web_contents);
+  if (zoom_controller)
+    return zoom_controller->GetDefaultZoomLevel();
+  return content::HostZoomMap::GetDefaultForBrowserContext(
+             web_contents->GetBrowserContext())->GetDefaultZoomLevel();

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

Align this just four spaces w/r/t the previous line.

[wjmaclean, 2014/10/01 20:33:00]

Done.

+}
+
 }  // namespace
 
 PrefsTabHelper::PrefsTabHelper(WebContents* contents)
     : web_contents_(contents),
       weak_ptr_factory_(this) {
   PrefService* prefs = GetProfile()->GetPrefs();
   pref_change_registrar_.Init(prefs);
   if (prefs) {
+    // TODO(wjmaclean): Convert this to use the content-specific zoom-level
+    // prefs when HostZoomMap moves to StoragePartition.
+    chrome::ChromeZoomLevelPrefs* zoom_level_prefs =
+        GetProfile()->GetZoomLevelPrefs();
+
     base::Closure renderer_callback = base::Bind(
         &PrefsTabHelper::UpdateRendererPreferences, base::Unretained(this));
+    // Not all tests will create zoom_level_prefs.
+    if (zoom_level_prefs) {
+      pref_change_registrar_.Add(
+          zoom_level_prefs->GetDefaultZoomLevelPath().c_str(),

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

Hm, this is problematic. Like I said above you can't register keys that are
prefixes of other keys (or at least you can't rely on the fact that they share
subdictionaries), but that means you can't easily observe changes. You might
have to watch for changes to the top-level dictionary.

[wjmaclean, 2014/10/01 20:33:00]

As per our off-line discussion, this means I will have to force *all* access to
this parameter to go through ChromeZoomLevelPrefs so it can manage notifications
for any interested clients.

+          renderer_callback);
+    }
     pref_change_registrar_.Add(prefs::kAcceptLanguages, renderer_callback);
-    pref_change_registrar_.Add(prefs::kDefaultZoomLevel, renderer_callback);
     pref_change_registrar_.Add(prefs::kEnableDoNotTrack, renderer_callback);
     pref_change_registrar_.Add(prefs::kEnableReferrers, renderer_callback);
 
 #if !defined(OS_MACOSX)
     pref_change_registrar_.Add(prefs::kFullscreenAllowed, renderer_callback);
 #endif
 
     PrefChangeRegistrar::NamedChangeCallback webkit_callback = base::Bind(
         &PrefsTabHelper::OnWebPrefChanged, base::Unretained(this));
     for (int i = 0; i < kPrefsToObserveLength; ++i) {
@@ skipping 17 matching lines @@
                                   prefs::kWebKitCursiveFontFamilyMap,
                                   webkit_callback);
     RegisterFontFamilyMapObserver(&pref_change_registrar_,
                                   prefs::kWebKitFantasyFontFamilyMap,
                                   webkit_callback);
     RegisterFontFamilyMapObserver(&pref_change_registrar_,
                                   prefs::kWebKitPictographFontFamilyMap,
                                   webkit_callback);
   }
 
-  renderer_preferences_util::UpdateFromSystemSettings(
-      web_contents_->GetMutableRendererPrefs(), GetProfile());
+  content::RendererPreferences* render_prefs =
+      web_contents_->GetMutableRendererPrefs();
+  renderer_preferences_util::UpdateFromSystemSettings(render_prefs,
+                                                      GetProfile());
+  render_prefs->default_zoom_level = GetDefaultZoomLevel(web_contents_);
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES)
-  registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
-                 content::Source<ThemeService>(
-                     ThemeServiceFactory::GetForProfile(GetProfile())));
+            registrar_.Add(

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

Indent is off here.

[wjmaclean, 2014/10/01 20:33:00]

Done.

+                this,
+                chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
+                content::Source<ThemeService>(
+                    ThemeServiceFactory::GetForProfile(GetProfile())));
 #endif
 #if defined(USE_AURA)
   registrar_.Add(this,
                  chrome::NOTIFICATION_BROWSER_FLING_CURVE_PARAMETERS_CHANGED,
                  content::NotificationService::AllSources());
 #endif
 }
 
 PrefsTabHelper::~PrefsTabHelper() {
 }
@@ skipping 181 matching lines @@
 
   NOTREACHED();
 }
 
 void PrefsTabHelper::UpdateWebPreferences() {
   web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(
       web_contents_->GetRenderViewHost()->GetWebkitPreferences());
 }
 
 void PrefsTabHelper::UpdateRendererPreferences() {
-  renderer_preferences_util::UpdateFromSystemSettings(
-      web_contents_->GetMutableRendererPrefs(), GetProfile());
+  content::RendererPreferences* prefs =
+      web_contents_->GetMutableRendererPrefs();
+  renderer_preferences_util::UpdateFromSystemSettings(prefs, GetProfile());
+  prefs->default_zoom_level = GetDefaultZoomLevel(web_contents_);
   web_contents_->GetRenderViewHost()->SyncRendererPrefs();
 }
 
 Profile* PrefsTabHelper::GetProfile() {
   return Profile::FromBrowserContext(web_contents_->GetBrowserContext());
 }
 
 void PrefsTabHelper::OnFontFamilyPrefChanged(const std::string& pref_name) {
   // When a font family pref's value goes from non-empty to the empty string, we
   // must add it to the usual WebPreferences struct passed to the renderer.
@@ skipping 24 matching lines @@
   }
 }
 
 void PrefsTabHelper::OnWebPrefChanged(const std::string& pref_name) {
 #if !defined(OS_ANDROID)
   OnFontFamilyPrefChanged(pref_name);
 #endif
 
   web_contents_->GetRenderViewHost()->OnWebkitPreferencesChanged();
 }