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

Side by Side Diff: chrome/browser/ui/ash/app_list/extension_app_item.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/ash/app_list/extension_app_item.h" 5 #include "chrome/browser/ui/ash/app_list/extension_app_item.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/extensions/extension_prefs.h" 8 #include "chrome/browser/extensions/extension_prefs.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/extensions/extension_system.h" 10 #include "chrome/browser/extensions/extension_system.h"
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 } 268 }
269 269
270 ui::MenuModel* ExtensionAppItem::GetContextMenuModel() { 270 ui::MenuModel* ExtensionAppItem::GetContextMenuModel() {
271 // No context menu for Chrome app. 271 // No context menu for Chrome app.
272 if (extension_id_ == extension_misc::kChromeAppId) 272 if (extension_id_ == extension_misc::kChromeAppId)
273 return NULL; 273 return NULL;
274 274
275 if (!context_menu_model_.get()) { 275 if (!context_menu_model_.get()) {
276 context_menu_model_.reset(new ui::SimpleMenuModel(this)); 276 context_menu_model_.reset(new ui::SimpleMenuModel(this));
277 context_menu_model_->AddItem(LAUNCH, UTF8ToUTF16(title())); 277 context_menu_model_->AddItem(LAUNCH, UTF8ToUTF16(title()));
278 context_menu_model_->AddSeparator(); 278 context_menu_model_->AddSeparator(ui::NORMAL_SEPARATOR);
279 context_menu_model_->AddItemWithStringId( 279 context_menu_model_->AddItemWithStringId(
280 TOGGLE_PIN, 280 TOGGLE_PIN,
281 controller_->IsAppPinned(extension_id_) ? 281 controller_->IsAppPinned(extension_id_) ?
282 IDS_APP_LIST_CONTEXT_MENU_UNPIN : 282 IDS_APP_LIST_CONTEXT_MENU_UNPIN :
283 IDS_APP_LIST_CONTEXT_MENU_PIN); 283 IDS_APP_LIST_CONTEXT_MENU_PIN);
284 context_menu_model_->AddSeparator(); 284 context_menu_model_->AddSeparator(ui::NORMAL_SEPARATOR);
285 context_menu_model_->AddCheckItemWithStringId( 285 context_menu_model_->AddCheckItemWithStringId(
286 LAUNCH_TYPE_REGULAR_TAB, 286 LAUNCH_TYPE_REGULAR_TAB,
287 IDS_APP_CONTEXT_MENU_OPEN_REGULAR); 287 IDS_APP_CONTEXT_MENU_OPEN_REGULAR);
288 context_menu_model_->AddCheckItemWithStringId( 288 context_menu_model_->AddCheckItemWithStringId(
289 LAUNCH_TYPE_PINNED_TAB, 289 LAUNCH_TYPE_PINNED_TAB,
290 IDS_APP_CONTEXT_MENU_OPEN_PINNED); 290 IDS_APP_CONTEXT_MENU_OPEN_PINNED);
291 context_menu_model_->AddCheckItemWithStringId( 291 context_menu_model_->AddCheckItemWithStringId(
292 LAUNCH_TYPE_WINDOW, 292 LAUNCH_TYPE_WINDOW,
293 IDS_APP_CONTEXT_MENU_OPEN_WINDOW); 293 IDS_APP_CONTEXT_MENU_OPEN_WINDOW);
294 // Even though the launch type is Full Screen it is more accurately 294 // Even though the launch type is Full Screen it is more accurately
295 // described as Maximized in Ash. 295 // described as Maximized in Ash.
296 context_menu_model_->AddCheckItemWithStringId( 296 context_menu_model_->AddCheckItemWithStringId(
297 LAUNCH_TYPE_FULLSCREEN, 297 LAUNCH_TYPE_FULLSCREEN,
298 IDS_APP_CONTEXT_MENU_OPEN_MAXIMIZED); 298 IDS_APP_CONTEXT_MENU_OPEN_MAXIMIZED);
299 context_menu_model_->AddSeparator(); 299 context_menu_model_->AddSeparator(ui::NORMAL_SEPARATOR);
300 context_menu_model_->AddItemWithStringId(OPTIONS, IDS_NEW_TAB_APP_OPTIONS); 300 context_menu_model_->AddItemWithStringId(OPTIONS, IDS_NEW_TAB_APP_OPTIONS);
301 context_menu_model_->AddItemWithStringId(DETAILS, IDS_NEW_TAB_APP_DETAILS); 301 context_menu_model_->AddItemWithStringId(DETAILS, IDS_NEW_TAB_APP_DETAILS);
302 context_menu_model_->AddItemWithStringId(UNINSTALL, 302 context_menu_model_->AddItemWithStringId(UNINSTALL,
303 IDS_EXTENSIONS_UNINSTALL); 303 IDS_EXTENSIONS_UNINSTALL);
304 } 304 }
305 305
306 return context_menu_model_.get(); 306 return context_menu_model_.get();
307 } 307 }
OLDNEW
« no previous file with comments | « chrome/browser/translate/options_menu_model.cc ('k') | chrome/browser/ui/ash/launcher/launcher_context_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698