chrome/browser/ui/apps/chrome_app_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/ui/apps/chrome_app_delegate.cc

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

Patch Set: Move ui_zoom stuff to components instead. 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/renderer_preferences_util.cc ('k') | chrome/browser/ui/autofill/chrome_autofill_client.h » ('j') | chrome/browser/ui/cocoa/location_bar/zoom_decoration_unittest.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/apps/chrome_app_delegate.cc

diff --git a/chrome/browser/ui/apps/chrome_app_delegate.cc b/chrome/browser/ui/apps/chrome_app_delegate.cc

index 0a70e0f2bf4e8b3ad4773a21ef9d9aa64c3a3424..26509458863e73235c02343d1c99f445fcaa0194 100644

--- a/chrome/browser/ui/apps/chrome_app_delegate.cc

+++ b/chrome/browser/ui/apps/chrome_app_delegate.cc

@@ -22,8 +22,8 @@

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"

#include "chrome/browser/ui/web_contents_sizer.h"

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

#include "chrome/common/extensions/chrome_extension_messages.h"

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

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

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

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

@@ -182,7 +182,7 @@ void ChromeAppDelegate::InitWebContents(content::WebContents* web_contents) {

// Kiosk app supports zooming.

if (chrome::IsRunningInForcedAppMode())

- ZoomController::CreateForWebContents(web_contents);

+ components::ZoomController::CreateForWebContents(web_contents);

}

void ChromeAppDelegate::ResizeWebContents(content::WebContents* web_contents,