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

chrome/browser/ui/webui/options/browser_options_handler.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/webui/options/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 42 matching lines @@
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/options/options_handlers_helper.h"
+#include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "chromeos/chromeos_switches.h"
@@ skipping 728 matching lines @@
   OnStateChanged();
 }
 
 void BrowserOptionsHandler::PageLoadStarted() {
   page_initialized_ = false;
 }
 
 void BrowserOptionsHandler::InitializeHandler() {
   Profile* profile = Profile::FromWebUI(web_ui());
   PrefService* prefs = profile->GetPrefs();
+  chrome::ChromeZoomLevelPrefs* zoom_level_prefs = profile->GetZoomLevelPrefs();
+  DCHECK(zoom_level_prefs);
 
   ProfileSyncService* sync_service(
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile));
   // TODO(blundell): Use a ScopedObserver to observe the PSS so that cleanup on
   // destruction is automatic.
   if (sync_service)
     sync_service->AddObserver(this);
 
   SigninManagerBase* signin_manager(
       SigninManagerFactory::GetInstance()->GetForProfile(profile));
@@ skipping 37 matching lines @@
 
   // No preferences below this point may be modified by guest profiles.
   if (Profile::FromWebUI(web_ui())->IsGuestSession())
     return;
 
   auto_open_files_.Init(
       prefs::kDownloadExtensionsToOpen, prefs,
       base::Bind(&BrowserOptionsHandler::SetupAutoOpenFileTypes,
                  base::Unretained(this)));
   default_zoom_level_.Init(
-      prefs::kDefaultZoomLevel, prefs,
+      zoom_level_prefs->GetDefaultZoomLevelPath().c_str(),
+      prefs,
       base::Bind(&BrowserOptionsHandler::SetupPageZoomSelector,
                  base::Unretained(this)));
   profile_pref_registrar_.Init(prefs);
   profile_pref_registrar_.Add(
       prefs::kNetworkPredictionOptions,
       base::Bind(&BrowserOptionsHandler::SetupNetworkPredictionControl,
                  base::Unretained(this)));
   profile_pref_registrar_.Add(
       prefs::kWebKitDefaultFontSize,
       base::Bind(&BrowserOptionsHandler::SetupFontSizeSelector,
@@ skipping 648 matching lines @@
       PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
       pref_service->SetInteger(prefs::kWebKitDefaultFontSize, font_size);
       SetupFontSizeSelector();
     }
   }
 }
 
 void BrowserOptionsHandler::HandleDefaultZoomFactor(
     const base::ListValue* args) {
   double zoom_factor;
-  if (ExtractDoubleValue(args, &zoom_factor)) {
+  if (ExtractDoubleValue(args, &zoom_factor))
     default_zoom_level_.SetValue(content::ZoomFactorToZoomLevel(zoom_factor));
-  }
 }
 
 void BrowserOptionsHandler::HandleRestartBrowser(const base::ListValue* args) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // If hardware acceleration is disabled then we need to force restart
   // browser in desktop mode.
   // TODO(shrikant): Remove this once we fix start mode logic for browser.
   // Currently there are issues with determining correct browser mode
   // at startup.
   if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) {
@@ skipping 235 matching lines @@
       dict.SetString("controlledBy", "policy");
   } else if (default_font_size->IsExtensionControlled() ||
              default_fixed_font_size->IsExtensionControlled()) {
       dict.SetString("controlledBy", "extension");
   }
 
   web_ui()->CallJavascriptFunction("BrowserOptions.setFontSize", dict);
 }
 
 void BrowserOptionsHandler::SetupPageZoomSelector() {
-  PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
-  double default_zoom_level = pref_service->GetDouble(prefs::kDefaultZoomLevel);
+  double default_zoom_level =
+      content::HostZoomMap::GetDefaultForBrowserContext(
+          Profile::FromWebUI(web_ui()))->GetDefaultZoomLevel();
   double default_zoom_factor =
       content::ZoomLevelToZoomFactor(default_zoom_level);
 
   // Generate a vector of zoom factors from an array of known presets along with
   // the default factor added if necessary.
   std::vector<double> zoom_factors =
       chrome_page_zoom::PresetZoomFactors(default_zoom_factor);
 
   // Iterate through the zoom factors and and build the contents of the
   // selector that will be sent to the javascript handler.
@@ skipping 169 matching lines @@
 
 void BrowserOptionsHandler::SetMetricsReportingCheckbox(bool checked,
                                                         bool disabled) {
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setMetricsReportingCheckboxState",
       base::FundamentalValue(checked),
       base::FundamentalValue(disabled));
 }
 
 }  // namespace options