chrome/browser/ui/panels/panel_host.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/panels/panel_host.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/cocoa/wrench_menu/wrench_menu_controller.mm ('k') | chrome/browser/ui/tab_helpers.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/panels/panel_host.cc

diff --git a/chrome/browser/ui/panels/panel_host.cc b/chrome/browser/ui/panels/panel_host.cc

index 2c190d3c39a1570a9c939a583d49020a071beaa3..7d8175f70afcd6e0d1c3e3dcc002dfcf2b2f9f8d 100644

--- a/chrome/browser/ui/panels/panel_host.cc

+++ b/chrome/browser/ui/panels/panel_host.cc

@@ -17,7 +17,6 @@

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

#include "chrome/browser/ui/panels/panel.h"

#include "chrome/browser/ui/prefs/prefs_tab_helper.h"

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

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

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

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

@@ -27,6 +26,7 @@

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

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

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

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

#include "extensions/browser/view_type_utils.h"

#include "extensions/common/extension_messages.h"

#include "ipc/ipc_message.h"

@@ -57,7 +57,7 @@ void PanelHost::Init(const GURL& url) {

web_contents_->SetDelegate(this);

// web_contents_ may be passed to chrome_page_zoom::Zoom(), so it needs

// a ZoomController.

- ZoomController::CreateForWebContents(web_contents_.get());

+ extensions::ZoomController::CreateForWebContents(web_contents_.get());

content::WebContentsObserver::Observe(web_contents_.get());

// Needed to give the web contents a Tab ID. Extension APIs