chrome/browser/ui/zoom/zoom_controller.cc - Issue 11866004: Add scheme to HostZoomMap

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.cc

Issue 11866004: Add scheme to HostZoomMap (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Add namespace Created 7 years, 9 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:

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

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

index 329222482bd85e0d60e483af7ed13cbaa7151b41..686d89e916d9e0cab1d176303140a0b34e57bfc4 100644

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

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

@@ -68,8 +68,10 @@ void ZoomController::DidNavigateMainFrame(

UpdateState(std::string());

}

-void ZoomController::OnZoomLevelChanged(const std::string& host) {

- UpdateState(host);

+void ZoomController::OnZoomLevelChanged(

+ const content::HostZoomMap::ZoomLevelChange& change) {

+ if (change.mode != content::HostZoomMap::ZOOM_CHANGED_TEMPORARY_ZOOM)

+ UpdateState(change.host);

}

void ZoomController::UpdateState(const std::string& host) {