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

Side by Side Diff: chrome/browser/ui/toolbar/action_box_menu_model.cc

Issue 10837317: Setting the touch wrench menu as default menu for ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: And another merge! 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/toolbar/action_box_menu_model.h" 5 #include "chrome/browser/ui/toolbar/action_box_menu_model.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "chrome/browser/extensions/extension_toolbar_model.h" 9 #include "chrome/browser/extensions/extension_toolbar_model.h"
10 #include "grit/generated_resources.h" 10 #include "grit/generated_resources.h"
(...skipping 24 matching lines...) Expand all
35 IDS_CHROME_TO_MOBILE_BUBBLE_TOOLTIP); 35 IDS_CHROME_TO_MOBILE_BUBBLE_TOOLTIP);
36 SetIcon(0, rb.GetNativeImageNamed(IDR_MOBILE)); 36 SetIcon(0, rb.GetNativeImageNamed(IDR_MOBILE));
37 InsertItemWithStringIdAt(1, IDC_BOOKMARK_PAGE, 37 InsertItemWithStringIdAt(1, IDC_BOOKMARK_PAGE,
38 starred ? IDS_TOOLTIP_STARRED : IDS_TOOLTIP_STAR); 38 starred ? IDS_TOOLTIP_STARRED : IDS_TOOLTIP_STAR);
39 SetIcon(1, rb.GetNativeImageNamed(starred ? IDR_STAR_LIT : IDR_STAR)); 39 SetIcon(1, rb.GetNativeImageNamed(starred ? IDR_STAR_LIT : IDR_STAR));
40 40
41 // Adds extensions to the model. 41 // Adds extensions to the model.
42 int command_id = kFirstExtensionCommandId; 42 int command_id = kFirstExtensionCommandId;
43 const extensions::ExtensionList& action_box_items = action_box_menu_items(); 43 const extensions::ExtensionList& action_box_items = action_box_menu_items();
44 if (!action_box_items.empty()) { 44 if (!action_box_items.empty()) {
45 AddSeparator(); 45 AddSeparator(ui::NORMAL_SEPARATOR);
46 for (size_t i = 0; i < action_box_items.size(); ++i) { 46 for (size_t i = 0; i < action_box_items.size(); ++i) {
47 const extensions::Extension* extension = action_box_items[i]; 47 const extensions::Extension* extension = action_box_items[i];
48 AddItem(command_id, UTF8ToUTF16(extension->name())); 48 AddItem(command_id, UTF8ToUTF16(extension->name()));
49 id_to_extension_id_map_[command_id++] = extension->id(); 49 id_to_extension_id_map_[command_id++] = extension->id();
50 } 50 }
51 } 51 }
52 } 52 }
53 53
54 ActionBoxMenuModel::~ActionBoxMenuModel() { 54 ActionBoxMenuModel::~ActionBoxMenuModel() {
55 // Ensures parent destructor does not use a partially destroyed delegate. 55 // Ensures parent destructor does not use a partially destroyed delegate.
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 90
91 void ActionBoxMenuModel::ExecuteCommand(int command_id) { 91 void ActionBoxMenuModel::ExecuteCommand(int command_id) {
92 if (command_id < kFirstExtensionCommandId) 92 if (command_id < kFirstExtensionCommandId)
93 chrome::ExecuteCommand(browser_, command_id); 93 chrome::ExecuteCommand(browser_, command_id);
94 } 94 }
95 95
96 void ActionBoxMenuModel::Observe(int type, 96 void ActionBoxMenuModel::Observe(int type,
97 const content::NotificationSource& source, 97 const content::NotificationSource& source,
98 const content::NotificationDetails& details) { 98 const content::NotificationDetails& details) {
99 } 99 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/tabs/tab_menu_model.cc ('k') | chrome/browser/ui/toolbar/back_forward_menu_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698