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

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/extensions/api/tabs/tabs_test.cc ('k') | chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.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.h

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

index 71d5d17a4993b4e3594653b3699faf703a16abc9..637726439615f09ffa1733926dae0dd60b101b29 100644

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

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

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

#define CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_CHROME_WEB_VIEW_GUEST_DELEGATE_H_

#include "chrome/browser/extensions/api/web_view/chrome_web_view_internal_api.h"

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

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

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

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

@@ -23,7 +23,7 @@ class SimpleMenuModel;

namespace extensions {

class ChromeWebViewGuestDelegate : public WebViewGuestDelegate,

- public ZoomObserver {

+ public ui_zoom::ZoomObserver {

public :

explicit ChromeWebViewGuestDelegate(WebViewGuest* web_view_guest);

~ChromeWebViewGuestDelegate() override;

@@ -43,7 +43,8 @@ class ChromeWebViewGuestDelegate : public WebViewGuestDelegate,

void OnShowContextMenu(int request_id, const MenuItemVector* items) override;

// ZoomObserver implementation.

- void OnZoomChanged(const ZoomController::ZoomChangedEventData& data) override;

+ void OnZoomChanged(

+ const ui_zoom::ZoomController::ZoomChangedEventData& data) override;

WebViewGuest* web_view_guest() const { return web_view_guest_; }