Action box menu

chrome/browser/ui/views/action_box_menu.cc

+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/ui/views/action_box_menu.h"
+
+#include "chrome/browser/ui/toolbar/action_box_menu_model.h"
+#include "chrome/browser/ui/views/browser_action_view.h"
+#include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/views/bubble/bubble_border.h"
+#include "ui/views/controls/button/menu_button.h"
+#include "ui/views/controls/menu/menu_runner.h"
+#include "ui/views/view.h"
+
+#if defined(OS_WIN)
+// Included for MENU_POPUPITEM and a few other Windows specific constants.
+#include <vssym32.h>
+#include "ui/base/native_theme/native_theme_win.h"
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// ActionBoxMenu
+
+ActionBoxMenu::ActionBoxMenu(Browser* browser,
+                             ActionBoxMenuModel* model,
+                             bool starred)
+    : browser_(browser),
+      root_(NULL),
+      model_(model),
+      starred_(starred) {
+}
+
+ActionBoxMenu::~ActionBoxMenu() {
+}
+
+void ActionBoxMenu::Init() {
+  DCHECK(!root_);
+  root_ = new views::MenuItemView(this);
+  root_->set_has_icons(true);
+  PopulateMenu();
+  menu_runner_.reset(new views::MenuRunner(root_));

[Peter Kasting, 2012/08/03 23:17:42]

Do this in RunMenu() rather than here; this is common convention and also makes
calling RunMenu() multiple times safe (not that you actually do this today).

[yefimt, 2012/08/07 00:47:06]

Done.

+}
+
+void ActionBoxMenu::RunMenu(views::MenuButton* menu_button) {
+  gfx::Point screen_location;
+  views::View::ConvertPointToScreen(menu_button, &screen_location);
+  // Ignore the result since we don't need to handle a deleted menu specially.
+  ignore_result(
+      menu_runner_->RunMenuAt(menu_button->GetWidget(),
+                              menu_button,
+                              gfx::Rect(screen_location, menu_button->size()),
+                              views::MenuItemView::TOPRIGHT,
+                              views::MenuRunner::HAS_MNEMONICS));
+}
+
+void ActionBoxMenu::ExecuteCommand(int id) {
+};
+
+views::Border* ActionBoxMenu::CreateMenuBorder() {
+  // TODO(yefim): Use correct theme color on non-Windows.
+  SkColor border_color = SK_ColorBLACK;
+#if defined(OS_WIN)
+  // TODO(yefim): Move to Windows only files if possible.
+  border_color = ui::NativeThemeWin::instance()->GetThemeColorWithDefault(
+      ui::NativeThemeWin::MENU, MENU_POPUPITEM, MPI_NORMAL, TMT_TEXTCOLOR,
+      COLOR_MENUTEXT);
+#endif
+  return views::Border::CreateSolidBorder(1, border_color);
+}
+
+views::Background* ActionBoxMenu::CreateMenuBackground() {
+  // TODO(yefim): Use correct theme color on non-Windows.
+  SkColor background_color = SK_ColorWHITE;
+#if defined(OS_WIN)
+  // TODO(yefim): Move to Windows only files if possible.
+  background_color = ui::NativeThemeWin::instance()->GetThemeColorWithDefault(
+      ui::NativeThemeWin::TEXTFIELD, EP_BACKGROUND, EBS_NORMAL,
+      TMT_BACKGROUND, COLOR_WINDOW);
+#endif
+  return views::Background::CreateSolidBackground(background_color);
+}
+
+int ActionBoxMenu::GetCurrentTabId() const {
+  return 0;
+}
+
+void ActionBoxMenu::OnBrowserActionExecuted(BrowserActionButton* button) {
+}
+
+void ActionBoxMenu::OnBrowserActionVisibilityChanged() {
+}
+
+gfx::Point ActionBoxMenu::GetViewContentOffset() const {
+  return gfx::Point(0, 0);
+}
+
+bool ActionBoxMenu::NeedToShowMultipleIconStates() const {
+  return false;
+}
+
+bool ActionBoxMenu::NeedToShowTooltip() const {
+  return false;
+}
+
+void ActionBoxMenu::WriteDragDataForView(views::View* sender,
+                                         const gfx::Point& press_pt,
+                                         ui::OSExchangeData* data) {
+}
+
+int ActionBoxMenu::GetDragOperationsForView(views::View* sender,
+                                            const gfx::Point& p) {
+  return 0;
+}
+
+bool ActionBoxMenu::CanStartDragForView(views::View* sender,
+                                        const gfx::Point& press_pt,
+                                        const gfx::Point& p) {
+  return false;
+}
+
+void ActionBoxMenu::Observe(int type,
+                            const content::NotificationSource& source,
+                            const content::NotificationDetails& details) {
+}
+
+void ActionBoxMenu::PopulateMenu() {
+  int item_id = 1;
+  AddBookmarkMenuItem(root_, &item_id);
+  if (model_->GetItemCount() > 0)
+    root_->AppendSeparator();
+
+  for (int model_index = 0; model_index < model_->GetItemCount();
+       ++model_index) {
+    DCHECK(model_->GetTypeAt(model_index) == ui::MenuModel::TYPE_COMMAND);
+    views::MenuItemView* menu_item = root_->AppendMenuItemFromModel(
+        model_, model_index, item_id + model_index);
+    menu_item->SetMargins(0, 0);
+    const extensions::Extension* extension =

[Peter Kasting, 2012/08/03 23:17:42]

Nit: If the extension toolbar model provides an action_box_menu_items()
accessor, this can be changed to:

  const extensions::ExtensionList& menu_items =
     extensions::ExtensionSystem::Get(browser_->profile())->
         extension_service()->toolbar_model()->action_box_menu_items();
  for (...) {
    ...
    BrowserActionView* view = new BrowserActionView(menu_items[index], ...

This is part 2 of 2 in eliminating
ActionBoxMenuModel::GetActionBoxExtensionByIndex(), and avoids plumbing this
sort of data through an extra class rather than getting it directly from here. 
(Direct dependencies like this make refactoring the intermediate classes easier
later by avoiding unnecessary plumbing.)

[yefimt, 2012/08/07 00:47:06]

Would it be logical to get |menu_items| from |model_|?

[Peter Kasting, 2012/08/07 01:06:49]

As you've done in patch set 20?  I don't think it provides any advantage --
after all, the extension service is already accessible directly from here
without plumbing any new variables (see code in previous comment set) -- and it
requires exposing another method on the menu model, enlarging the API surface. 
So I view it as a slightly worse solution.  But if you really feel strongly that
it's superior, I won't stop you.

+        model_->GetActionBoxExtensionByIndex(model_index);
+    BrowserActionView* view = new BrowserActionView(extension,
+        browser_, this);
+    browser_action_views_.push_back(view);
+    menu_item->SetIconView(view);
+  }
+}
+
+views::MenuItemView* ActionBoxMenu::AddBookmarkMenuItem(
+    views::MenuItemView* parent,
+    int* item_id) {
+  string16 label = l10n_util::GetStringUTF16(starred_ ?
+      IDS_TOOLTIP_STARRED : IDS_TOOLTIP_STAR);
+  gfx::ImageSkia* icon =
+      ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+          starred_ ? IDR_STAR_LIT : IDR_STAR);
+  views::MenuItemView* item =
+      parent->AppendMenuItemWithIcon(*item_id, label, *icon);
+  (*item_id)++;
+  return item;
+}