chrome/browser/ui/webui/options/browser_options_handler.h - Issue 541103002: Introduce ChromeZoomLevelPref, make zoom level prefs independent of profile prefs.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.h

Issue 541103002: Introduce ChromeZoomLevelPref, make zoom level prefs independent of profile prefs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Experiment: Windows hash function test. Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/profiles/profile_impl.cc ('K') | « chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/browser_options_handler.h

diff --git a/chrome/browser/ui/webui/options/browser_options_handler.h b/chrome/browser/ui/webui/options/browser_options_handler.h

index 95c889dd90433dca79491e4b31c661ea3b2a54a4..fc6bc050365146feec350f414947c156c7c852f1 100644

--- a/chrome/browser/ui/webui/options/browser_options_handler.h

+++ b/chrome/browser/ui/webui/options/browser_options_handler.h

@@ -20,6 +20,7 @@

#include "chrome/browser/sync/profile_sync_service_observer.h"

#include "chrome/browser/ui/host_desktop.h"

#include "chrome/browser/ui/webui/options/options_ui.h"

+#include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"

#include "components/search_engines/template_url_service_observer.h"

#include "components/signin/core/browser/signin_manager_base.h"

#include "content/public/browser/notification_observer.h"

@@ -372,7 +373,9 @@ class BrowserOptionsHandler

bool cloud_print_mdns_ui_enabled_;

StringPrefMember auto_open_files_;

- DoublePrefMember default_zoom_level_;

+ scoped_ptr<chrome::ChromeZoomLevelPrefs::DefaultZoomLevelSubscription>

+ default_zoom_level_subscription_;

PrefChangeRegistrar profile_pref_registrar_;

#if defined(OS_CHROMEOS)