Activated send-to-mobile and bookmark in action box for Windows.

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) && !defined(USE_AURA)
 // Included for MENU_POPUPITEM and a few other Windows specific constants.
 #include <vssym32.h>
 #include "ui/base/native_theme/native_theme_win.h"
 #endif
 
+namespace {
+// Converts from the index of a menu item to the id of this item. Indices are

[msw, 2012/08/23 22:04:40]

nit: add a blank line above.

[beaudoin, 2012/08/24 19:34:38]

Done.

+// 0-based but IDs cannot be 0.
+inline int MenuIndexToItemId(int menu_index) {
+  return menu_index + 1;
+}
+
+// Converts from the id of a menu item to its index. Indices are 0-based but
+// IDs cannot be 0.
+inline int MenuItemIdToIndex(int menu_item_id) {
+  return menu_item_id - 1;
+}
+
+}  // namespace
+
 ////////////////////////////////////////////////////////////////////////////////
 // ActionBoxMenu
 
 ActionBoxMenu::ActionBoxMenu(Browser* browser, ActionBoxMenuModel* model)
     : browser_(browser),
       root_(NULL),
       model_(model) {
 }
 
 ActionBoxMenu::~ActionBoxMenu() {
@@ skipping 13 matching lines @@
   // 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) {
+  model_->ActivatedAt(MenuItemIdToIndex(id));
 }
 
 views::Border* ActionBoxMenu::CreateMenuBorder() {
   // TODO(yefim): Use correct theme color on non-Windows.
   SkColor border_color = SK_ColorBLACK;
 #if defined(OS_WIN) && !defined(USE_AURA)
   // 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);
@@ skipping 53 matching lines @@
 
 void ActionBoxMenu::Observe(int type,
                             const content::NotificationSource& source,
                             const content::NotificationDetails& details) {
 }
 
 void ActionBoxMenu::PopulateMenu() {
   for (int model_index = 0; model_index < model_->GetItemCount();
        ++model_index) {
     views::MenuItemView* menu_item = root_->AppendMenuItemFromModel(
-        model_, model_index, model_index + 1);
+        model_, model_index, MenuIndexToItemId(model_index));
     if (model_->GetTypeAt(model_index) == ui::MenuModel::TYPE_COMMAND) {
       menu_item->SetMargins(0, 0);
       if (model_->IsItemExtension(model_index)) {
         const extensions::Extension* extension =
             model_->GetExtensionAt(model_index);
         BrowserActionView* view = new BrowserActionView(extension,
             browser_, this);
         // |menu_item| will own the |view| from now on.
         menu_item->SetIconView(view);
       }
     }
   }
 }