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

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

Issue 10833056: Add a menu to the Action Box Button. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Applied review comments. Created 8 years, 5 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 047f60acfdd9a046e676bfdd66d8c88eb6a3db3f..225c9fae940206e76c1741499099779c55ae5b52 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
@@ -99,7 +99,7 @@ LocationBarViewMac::LocationBarViewMac(
OmniboxViewMac::GetFieldFont())),
plus_decoration_(NULL),
star_decoration_(new StarDecoration(command_updater)),
- chrome_to_mobile_decoration_(nil),
+ chrome_to_mobile_decoration_(NULL),
keyword_hint_decoration_(
new KeywordHintDecoration(OmniboxViewMac::GetFieldFont())),
profile_(profile),
@@ -121,7 +121,7 @@ LocationBarViewMac::LocationBarViewMac(
}
if (extensions::switch_utils::IsActionBoxEnabled()) {
- plus_decoration_.reset(new PlusDecoration(command_updater));
+ plus_decoration_.reset(new PlusDecoration(this, command_updater, browser_));
}
for (size_t i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
@@ -501,7 +501,7 @@ NSPoint LocationBarViewMac::GetChromeToMobileBubblePoint() const {
[cell frameForDecoration:chrome_to_mobile_decoration_.get()
inFrame:[field_ bounds]];
const NSPoint point =
- chrome_to_mobile_decoration_->GetBubblePointInFrame(frame);
+ chrome_to_mobile_decoration_->GetBubblePointInFrame(frame);
return [field_ convertPoint:point toView:nil];
}

Powered by Google App Engine
This is Rietveld 408576698