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

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

Issue 10887029: Only show chrome2mobile in action box if it is enabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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/plus_decoration.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/plus_decoration.mm b/chrome/browser/ui/cocoa/location_bar/plus_decoration.mm
index 7cf6ebcbe6c809f682b69a174840fc98ea8a1d3a..0b3c882e08542cfdce535306f906a831b50e37dc 100644
--- a/chrome/browser/ui/cocoa/location_bar/plus_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/plus_decoration.mm
@@ -4,8 +4,6 @@
#import "chrome/browser/ui/cocoa/location_bar/plus_decoration.h"
-#include "chrome/browser/command_updater.h"
-#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
#import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
@@ -25,9 +23,8 @@ const CGFloat kAnchorPointFrameHeight = 23.0;
} // namespace
PlusDecoration::PlusDecoration(LocationBarViewMac* owner,
- CommandUpdater* command_updater, Browser* browser)
+ Browser* browser)
: owner_(owner),
- command_updater_(command_updater),
browser_(browser) {
SetVisible(true);
@@ -45,9 +42,7 @@ bool PlusDecoration::AcceptsMousePress() {
}
bool PlusDecoration::OnMousePressed(NSRect frame) {
- ExtensionService* extension_service = extensions::ExtensionSystem::Get(
- browser_->profile())->extension_service();
- ActionBoxMenuModel menu_model(browser_, extension_service);
+ ActionBoxMenuModel menu_model(browser_);
// Controller for the menu attached to the plus decoration.
scoped_nsobject<MenuController> menu_controller(

Powered by Google App Engine
This is Rietveld 408576698