extensions/browser/guest_view/web_view/web_view_guest.h - Issue 787813004: Move ZoomController out of ChromeWebViewGuestDelegate.

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: extensions/browser/guest_view/web_view/web_view_guest.h

Issue 787813004: Move ZoomController out of ChromeWebViewGuestDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix build deps, address fsamuel@'s comments. 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 | « extensions/browser/guest_view/guest_view_base.cc ('k') | extensions/browser/guest_view/web_view/web_view_guest.cc » ('j') | extensions/browser/guest_view/web_view/web_view_guest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/guest_view/web_view/web_view_guest.h

diff --git a/extensions/browser/guest_view/web_view/web_view_guest.h b/extensions/browser/guest_view/web_view/web_view_guest.h

index be665abb93f7ac6d253fa25c08ac9a505de74b89..0de4a28a63b83bfe2d80eb18b90b89428d11f555 100644

--- a/extensions/browser/guest_view/web_view/web_view_guest.h

+++ b/extensions/browser/guest_view/web_view/web_view_guest.h

@@ -175,7 +175,7 @@ class WebViewGuest : public GuestView<WebViewGuest>,

const content::NotificationDetails& details) override;

// Returns the current zoom factor.

- double GetZoom();

+ double GetZoom() { return current_zoom_factor_; }

Fady Samuel 2014/12/09 21:41:42 Call zoom() const

wjmaclean 2014/12/09 22:12:37 Done.

// Begin or continue a find request.

void StartFinding(const base::string16& search_text,

@@ -369,6 +369,9 @@ class WebViewGuest : public GuestView<WebViewGuest>,

typedef std::map<WebViewGuest*, NewWindowInfo> PendingWindowMap;

PendingWindowMap pending_new_windows_;

+ // Stores the current zoom factor.

+ double current_zoom_factor_;

// This is used to ensure pending tasks will not fire after this object is

// destroyed.

base::WeakPtrFactory<WebViewGuest> weak_ptr_factory_;