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

Index: chrome/browser/ui/cocoa/location_bar/zoom_decoration.h

diff --git a/chrome/browser/ui/cocoa/location_bar/zoom_decoration.h b/chrome/browser/ui/cocoa/location_bar/zoom_decoration.h

index e4ad3332ee1263c6b7f25b76f06c37d3a1784bdf..b7c29e0833990c8314166d9606b95f45ed0364fd 100644

--- a/chrome/browser/ui/cocoa/location_bar/zoom_decoration.h

+++ b/chrome/browser/ui/cocoa/location_bar/zoom_decoration.h

@@ -15,7 +15,7 @@ class LocationBarViewMac;

@class ZoomBubbleController;

class ZoomDecorationTest;

-namespace ui_zoom {

+namespace zoom {

class ZoomController;

}

@@ -29,7 +29,7 @@ class ZoomDecoration : public ImageDecoration,

// Called when this decoration should show or hide itself in its most current

// state. Returns whether any updates were made.

- bool UpdateIfNecessary(ui_zoom::ZoomController* zoom_controller,

+ bool UpdateIfNecessary(zoom::ZoomController* zoom_controller,

bool default_zoom_changed,

bool location_bar_is_dark);

@@ -48,7 +48,7 @@ class ZoomDecoration : public ImageDecoration,

// Show and update UI associated with the zoom decoration.

// Virtual and protected for testing.

- virtual void ShowAndUpdateUI(ui_zoom::ZoomController* zoom_controller,

+ virtual void ShowAndUpdateUI(zoom::ZoomController* zoom_controller,

NSString* tooltip_string,

bool location_bar_is_dark);