chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm - 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/cocoa/location_bar/location_bar_view_mac.mm

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/ui/cocoa/browser/zoom_bubble_controller.mm ('k') | chrome/browser/ui/cocoa/location_bar/zoom_decoration.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

index a7a6e6063ac02e7b1f2f46b8802e6bed7f1929d4..d62b09625cd032d46eb3d8cc85244e9761ae5068 100644

--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

@@ -56,12 +56,12 @@

#include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"

#include "chrome/browser/ui/tabs/tab_strip_model.h"

#include "chrome/browser/ui/toolbar/toolbar_model.h"

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

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

#include "components/search_engines/template_url.h"

#include "components/search_engines/template_url_service.h"

#include "components/translate/core/browser/language_state.h"

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

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

#include "extensions/browser/extension_system.h"

#include "extensions/common/extension.h"

@@ -753,7 +753,7 @@ bool LocationBarViewMac::UpdateZoomDecoration() {

return false;

return zoom_decoration_->UpdateIfNecessary(

- ZoomController::FromWebContents(web_contents));

+ ui_zoom::ZoomController::FromWebContents(web_contents));

}

bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() {