chrome/browser/ui/tab_helpers.cc - Issue 769593003: Move ZoomObserver, ZoomController and ZoomEventManager to components/.

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

Issue 769593003: Move ZoomObserver, ZoomController and ZoomEventManager to components/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Mac build fix #4. Created 6 years 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

« no previous file with comments | « chrome/browser/ui/panels/panel_host.cc ('k') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('j') | chrome/browser/ui/views/location_bar/zoom_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/tab_helpers.cc

diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc

index 216ef76ed0b16512e679e49eacb283611811169f..7506202f1973bdabeafa50d49f925c10263a38c4 100644

--- a/chrome/browser/ui/tab_helpers.cc

+++ b/chrome/browser/ui/tab_helpers.cc

@@ -52,9 +52,9 @@

#include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"

#include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h"

#include "chrome/browser/ui/website_settings/permission_bubble_manager.h"

-#include "chrome/browser/ui/zoom/zoom_controller.h"

#include "components/pdf/browser/pdf_web_contents_helper.h"

#include "components/web_modal/web_contents_modal_dialog_manager.h"

+#include "extensions/browser/ui/zoom/zoom_controller.h"

#endif // defined(OS_ANDROID)

#if defined(OS_WIN)

@@ -123,7 +123,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {

#if !defined(OS_ANDROID)

// ZoomController comes before common tab helpers since ChromeAutofillClient

// may want to register as a ZoomObserver with it.

- ZoomController::CreateForWebContents(web_contents);

+ extensions::ZoomController::CreateForWebContents(web_contents);

#endif

// --- Common tab helpers ---