chrome/browser/ui/zoom/zoom_controller_browsertest.cc - 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/zoom/zoom_controller_browsertest.cc

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: Rebase to fix scoped_refptr conversion. Created 6 years, 3 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/options/browser_options_handler.cc ('k') | chrome/browser/ui/zoom/zoom_level_prefs_store_impl.h » ('j') | chrome/browser/ui/zoom/zoom_level_prefs_store_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/zoom/zoom_controller_browsertest.cc

diff --git a/chrome/browser/ui/zoom/zoom_controller_browsertest.cc b/chrome/browser/ui/zoom/zoom_controller_browsertest.cc

index 1fcd782a8a3f551f2c4b6447bb55041b1e4f7250..9f644de2da8d6349d4c0eae13cc494584e01c98e 100644

--- a/chrome/browser/ui/zoom/zoom_controller_browsertest.cc

+++ b/chrome/browser/ui/zoom/zoom_controller_browsertest.cc

@@ -105,8 +105,8 @@ IN_PROC_BROWSER_TEST_F(ZoomControllerBrowserTest, OnPreferenceChanged) {

ZoomChangedWatcher zoom_change_watcher(web_contents, zoom_change_data);

// TODO(wjmaclean): Convert this to call partition-specific zoom level prefs

// when they become available.

- browser()->profile()->GetPrefs()->SetDouble(prefs::kDefaultZoomLevel,

- new_default_zoom_level);

+ browser()->profile()->GetZoomLevelPrefs()->SetDouble(prefs::kDefaultZoomLevel,

+ new_default_zoom_level);

// Because this test relies on a round-trip IPC to/from the renderer process,

// we need to wait for it to propagate.

zoom_change_watcher.Wait();