chrome/browser/ui/views/location_bar/location_bar_view.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: chrome/browser/ui/views/location_bar/location_bar_view.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 | « chrome/browser/ui/views/apps/chrome_native_app_window_views.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index dcf35343b4817ed2cd83e3ecfdf044ae83e4fd05..1129954d9f529053da6130fa4cdb7d0a28dbf687 100644

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

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

@@ -22,7 +22,7 @@

#include "components/prefs/pref_member.h"

#include "components/search_engines/template_url_service_observer.h"

#include "components/security_state/security_state_model.h"

-#include "components/ui/zoom/zoom_event_manager_observer.h"

+#include "components/zoom/zoom_event_manager_observer.h"

#include "ui/gfx/animation/animation_delegate.h"

#include "ui/gfx/animation/slide_animation.h"

#include "ui/gfx/font.h"

@@ -74,7 +74,7 @@ class LocationBarView : public LocationBar,

public ChromeOmniboxEditController,

public DropdownBarHostDelegate,

public TemplateURLServiceObserver,

- public ui_zoom::ZoomEventManagerObserver {

+ public zoom::ZoomEventManagerObserver {

public:

class Delegate {

public: