chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.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/guest_view/web_view/chrome_web_view_guest_delegate.cc

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

Patch Set: Remove obsolete defines in build files. 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/guest_view/web_view/chrome_web_view_guest_delegate.h ('k') | chrome/browser/profiles/host_zoom_map_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc

diff --git a/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc b/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc

index 8c4c8f6ef5105d0a9effa879f18d2422ded96d23..511ae9a7463d967bfcbfd124174009594a7a7e05 100644

--- a/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc

+++ b/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc

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

#include "chrome/browser/favicon/favicon_tab_helper.h"

#include "chrome/browser/renderer_context_menu/render_view_context_menu.h"

#include "chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h"

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

#include "chrome/common/chrome_version_info.h"

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

#include "components/renderer_context_menu/context_menu_delegate.h"

+#include "components/ui/zoom/zoom_controller.h"

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

#include "extensions/browser/api/web_request/web_request_api.h"

#include "extensions/browser/guest_view/web_view/web_view_constants.h"

@@ -28,6 +28,8 @@

namespace extensions {

+using ui_zoom::ZoomController;

ChromeWebViewGuestDelegate::ChromeWebViewGuestDelegate(

WebViewGuest* web_view_guest)

: pending_context_menu_request_id_(0),