Chromium Code Reviews| 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 b53bd1597e75e9e1fbb04ca9cbfb7a887468e89c..fe754a70afa1ec5aef18bb259ee823f830dcae53 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 |
| @@ -8,7 +8,12 @@ |
| #include "chrome/app/chrome_command_ids.h" |
| #include "chrome/browser/command_updater.h" |
| #include "chrome/browser/extensions/extension_service.h" |
| +#include "chrome/browser/extensions/extension_system.h" |
| +#include "chrome/browser/ui/browser_finder.h" |
|
msw
2012/07/24 23:41:55
nit: is this include necessary?
yefimt
2012/07/25 21:09:21
Done.
|
| +#include "chrome/browser/ui/tab_contents/tab_contents.h" |
|
msw
2012/07/24 23:41:55
nit: is this include necessary?
yefimt
2012/07/25 21:09:21
Done.
|
| +#include "chrome/browser/ui/toolbar/action_box_menu_model.h" |
| #include "chrome/browser/ui/view_ids.h" |
| +#include "chrome/browser/ui/views/action_box_menu.h" |
| #include "chrome/browser/ui/views/browser_dialogs.h" |
| #include "grit/generated_resources.h" |
| #include "grit/theme_resources.h" |
| @@ -30,9 +35,11 @@ const SkColor kPushedBorderColor = SkColorSetRGB(191, 191, 191); |
| } // namespace |
| -ActionBoxButtonView::ActionBoxButtonView(ExtensionService* extension_service) |
| +ActionBoxButtonView::ActionBoxButtonView(Browser* browser, Profile* profile) |
| : views::MenuButton(NULL, string16(), this, false), |
| - extension_service_(extension_service) { |
| + browser_(browser), |
| + profile_(profile), |
| + bookmark_state_(false) { |
| set_id(VIEW_ID_ACTION_BOX_BUTTON); |
| SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_ACTION_BOX_BUTTON)); |
| SetIcon(*ui::ResourceBundle::GetSharedInstance().GetBitmapNamed( |
| @@ -73,5 +80,11 @@ void ActionBoxButtonView::GetAccessibleState(ui::AccessibleViewState* state) { |
| void ActionBoxButtonView::OnMenuButtonClicked(View* source, |
| const gfx::Point& point) { |
| - // TODO(yefim): Implement menu here. |
| + ExtensionService* extension_service = |
| + extensions::ExtensionSystem::Get(profile_)->extension_service(); |
| + |
| + ActionBoxMenuModel model(extension_service); |
| + ActionBoxMenu action_box_menu(browser_, &model, bookmark_state_); |
| + action_box_menu.Init(); |
| + action_box_menu.RunMenu(this); |
| } |