Index: chrome/browser/ui/webui/options/browser_options_handler.cc |
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc |
index ee5519ad07b9c94aa138c10fa90100fda283ffc5..91cb29c9dd3a52230d8b1c56985b4cb14161a7e6 100644 |
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc |
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc |
@@ -60,6 +60,7 @@ |
#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" |
@@ -808,6 +809,8 @@ void BrowserOptionsHandler::PageLoadStarted() { |
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)); |
@@ -865,7 +868,8 @@ void BrowserOptionsHandler::InitializeHandler() { |
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); |
@@ -1534,9 +1538,8 @@ void BrowserOptionsHandler::HandleDefaultFontSize(const base::ListValue* args) { |
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) { |
@@ -1792,8 +1795,9 @@ void BrowserOptionsHandler::SetupFontSizeSelector() { |
} |
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); |