Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(584)

Unified Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

Issue 12286006: [Mac] Implement the basic zoom bubble. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
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 d9af62830ae3cd45885fed97c5652a2112f92f31..fe47d2c15ef7ba1cfb6c38c446cf1363c42d98a4 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
@@ -103,7 +103,7 @@ LocationBarViewMac::LocationBarViewMac(
OmniboxViewMac::GetFieldFont())),
plus_decoration_(NULL),
star_decoration_(new StarDecoration(command_updater)),
- zoom_decoration_(new ZoomDecoration(toolbar_model)),
+ zoom_decoration_(new ZoomDecoration(this)),
keyword_hint_decoration_(
new KeywordHintDecoration(OmniboxViewMac::GetFieldFont())),
profile_(profile),
@@ -667,8 +667,7 @@ void LocationBarViewMac::Layout() {
if (plus_decoration_.get())
[cell addRightDecoration:plus_decoration_.get()];
[cell addRightDecoration:star_decoration_.get()];
- // TODO(dbeam): uncomment when zoom bubble exists.
- // [cell addRightDecoration:zoom_decoration_.get()];
+ [cell addRightDecoration:zoom_decoration_.get()];
// Note that display order is right to left.
for (size_t i = 0; i < page_action_decorations_.size(); ++i) {

Powered by Google App Engine
This is Rietveld 408576698