chrome/browser/ui/webui/constrained_web_dialog_delegate_base.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/webui/constrained_web_dialog_delegate_base.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

« chrome/browser/ui/views/location_bar/zoom_view.cc ('K') | « chrome/browser/ui/views/toolbar/wrench_menu.cc ('k') | chrome/browser/ui/webui/ntp/ntp_login_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc

diff --git a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc

index 2034190c4c20879be5174d28592ab421115fe63d..7fa1764e61ac2820ea48848511a569eed8f506f6 100644

--- a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc

+++ b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc

@@ -9,10 +9,10 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/renderer_preferences_util.h"

#include "chrome/browser/ui/webui/chrome_web_contents_handler.h"

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

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

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

#include "content/public/common/renderer_preferences.h"

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

#include "ipc/ipc_message.h"

#include "ui/web_dialogs/web_dialog_delegate.h"

#include "ui/web_dialogs/web_dialog_ui.h"

@@ -34,7 +34,7 @@ ConstrainedWebDialogDelegateBase::ConstrainedWebDialogDelegateBase(

CHECK(delegate);

web_contents_.reset(

WebContents::Create(WebContents::CreateParams(browser_context)));

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

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

if (tab_delegate) {

override_tab_delegate_.reset(tab_delegate);

web_contents_->SetDelegate(tab_delegate);