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

Unified Diff: chrome/browser/ui/views/location_bar/action_box_button_view.cc

Issue 10887029: Only show chrome2mobile in action box if it is enabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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/views/location_bar/action_box_button_view.cc
diff --git a/chrome/browser/ui/views/location_bar/action_box_button_view.cc b/chrome/browser/ui/views/location_bar/action_box_button_view.cc
index 1ccceef48f068a417a52289a44124e41bceb68f5..9d2a1d0e248e0df0d3f254e41eeedb81403d146a 100644
--- a/chrome/browser/ui/views/location_bar/action_box_button_view.cc
+++ b/chrome/browser/ui/views/location_bar/action_box_button_view.cc
@@ -35,10 +35,12 @@ const SkColor kPushedBorderColor = SkColorSetRGB(191, 191, 191);
} // namespace
-ActionBoxButtonView::ActionBoxButtonView(Browser* browser, Profile* profile)
+ActionBoxButtonView::ActionBoxButtonView(Browser* browser, Profile* profile,
msw 2012/08/29 19:27:04 nit: one arg per line.
Cait (Slow) 2012/08/29 20:26:14 Done.
+ CommandUpdater* command_updater)
: views::MenuButton(NULL, string16(), this, false),
browser_(browser),
- profile_(profile) {
+ profile_(profile),
+ command_updater_(command_updater) {
set_id(VIEW_ID_ACTION_BOX_BUTTON);
SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_ACTION_BOX_BUTTON));
SetIcon(*ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
@@ -87,7 +89,7 @@ void ActionBoxButtonView::OnMenuButtonClicked(View* source,
ExtensionService* extension_service =
extensions::ExtensionSystem::Get(profile_)->extension_service();
- ActionBoxMenuModel model(browser_, extension_service);
+ ActionBoxMenuModel model(browser_, extension_service, command_updater_);
ActionBoxMenu action_box_menu(browser_, &model);
action_box_menu.Init();
action_box_menu.RunMenu(this);

Powered by Google App Engine
This is Rietveld 408576698