Allow platform apps to add themselves to the Action Box.

chrome/browser/ui/toolbar/action_box_menu_model.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/toolbar/action_box_menu_model.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_to_mobile_service.h"
 #include "chrome/browser/chrome_to_mobile_service_factory.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
+using extensions::ActionInfo;
+
 ////////////////////////////////////////////////////////////////////////////////
 // ActionBoxMenuModel
 
 ActionBoxMenuModel::ActionBoxMenuModel(Browser* browser,
                                        ui::SimpleMenuModel::Delegate* delegate)
     : ui::SimpleMenuModel(delegate),
       browser_(browser) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   // TODO(msw): Show the item as disabled for chrome: and file: scheme pages?
   if (ChromeToMobileService::UpdateAndGetCommandState(browser_)) {
@@ skipping 13 matching lines @@
 }
 
 ActionBoxMenuModel::~ActionBoxMenuModel() {
 }
 
 void ActionBoxMenuModel::AddExtension(const extensions::Extension& extension,
                                       int command_id) {
   if (extension_ids_.empty())
     AddSeparator(ui::NORMAL_SEPARATOR);
   extension_ids_.push_back(extension.id());
-  AddItem(command_id, UTF8ToUTF16(extension.name()));
+  const ActionInfo* page_launcher_info =
+      ActionInfo::GetPageLauncherInfo(&extension);
+  AddItem(command_id, UTF8ToUTF16(page_launcher_info->default_title));
 }
 
 bool ActionBoxMenuModel::IsItemExtension(int index) {
   // The extensions are always at the end of the model.
   CHECK(index < GetItemCount());
   return index >= GetFirstExtensionIndex();
 }
 
 const extensions::Extension* ActionBoxMenuModel::GetExtensionAt(int index) {
   if (!IsItemExtension(index))
@@ skipping 10 matching lines @@
       extension_ids_[index_in_extension_ids]);
 }
 
 void ActionBoxMenuModel::ExecuteCommand(int command_id) {
   delegate()->ExecuteCommand(command_id);
 }
 
 int ActionBoxMenuModel::GetFirstExtensionIndex() {
   return GetItemCount() - extension_ids_.size();
 }