extensions/browser/guest_view/web_view/web_view_guest.h - Issue 2019423005: Move //components/ui/zoom to top-level under //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: extensions/browser/guest_view/web_view/web_view_guest.h

Issue 2019423005: Move //components/ui/zoom to top-level under //components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 7 months 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/extension_options/extension_options_guest.cc ('k') | extensions/browser/guest_view/web_view/web_view_guest.cc » ('j') | no next file with comments »
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 88d0f103d3c70b174c376c4ea2c5c3eb00b8d1eb..f7d686913588e38a24801ab5de415c0b1e4454ae 100644

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

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

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

double GetZoom() const;

// Get the current zoom mode.

- ui_zoom::ZoomController::ZoomMode GetZoomMode();

+ zoom::ZoomController::ZoomMode GetZoomMode();

// Request navigating the guest to the provided |src| URL.

void NavigateGuest(const std::string& src, bool force_navigation);

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

void SetZoom(double zoom_factor);

// Set the zoom mode.

- void SetZoomMode(ui_zoom::ZoomController::ZoomMode zoom_mode);

+ void SetZoomMode(zoom::ZoomController::ZoomMode zoom_mode);

void SetAllowScaling(bool allow);

bool allow_scaling() const { return allow_scaling_; }