chrome/browser/ui/views/location_bar/location_bar_view.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/views/location_bar/location_bar_view.cc

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

Patch Set: Mac build fix #4. 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/views/apps/chrome_native_app_window_views.cc ('k') | chrome/browser/ui/views/location_bar/zoom_bubble_view.cc » ('j') | chrome/browser/ui/views/location_bar/zoom_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/location_bar/location_bar_view.cc

diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc

index c05c5bdc1f26bccffb5cf2179e9df6fe25adb83c..6daed6efb1861bb54aa28bfc7c3516b40a888705 100644

--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc

+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc

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

#include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h"

#include "chrome/browser/ui/views/passwords/manage_passwords_icon_view.h"

#include "chrome/browser/ui/views/translate/translate_bubble_view.h"

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

#include "chrome/common/pref_names.h"

#include "chrome/grit/generated_resources.h"

#include "components/search_engines/template_url.h"

@@ -67,6 +66,7 @@

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

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

#include "extensions/browser/extension_registry.h"

+#include "extensions/browser/ui/zoom/zoom_controller.h"

#include "extensions/common/feature_switch.h"

#include "extensions/common/permissions/permissions_data.h"

#include "grit/components_scaled_resources.h"

@@ -1138,7 +1138,7 @@ bool LocationBarView::RefreshZoomView() {

if (!web_contents)

return false;

const bool was_visible = zoom_view_->visible();

- zoom_view_->Update(ZoomController::FromWebContents(web_contents));

+ zoom_view_->Update(extensions::ZoomController::FromWebContents(web_contents));

if (!zoom_view_->visible())

ZoomBubbleView::CloseBubble();

return was_visible != zoom_view_->visible();