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

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: Still build problems: Removed const from function since linux_clang didn't like that 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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 } 251 }
252 252
253 ui::MenuModel* ExtensionAppItem::GetContextMenuModel() { 253 ui::MenuModel* ExtensionAppItem::GetContextMenuModel() {
254 // No context menu for Chrome app. 254 // No context menu for Chrome app.
255 if (extension_id_ == extension_misc::kChromeAppId) 255 if (extension_id_ == extension_misc::kChromeAppId)
256 return NULL; 256 return NULL;
257 257
258 if (!context_menu_model_.get()) { 258 if (!context_menu_model_.get()) {
259 context_menu_model_.reset(new ui::SimpleMenuModel(this)); 259 context_menu_model_.reset(new ui::SimpleMenuModel(this));
260 context_menu_model_->AddItem(LAUNCH, UTF8ToUTF16(title())); 260 context_menu_model_->AddItem(LAUNCH, UTF8ToUTF16(title()));
261 context_menu_model_->AddSeparator(); 261 context_menu_model_->AddSeparator(ui::NORMAL_SEPARATOR);
262 context_menu_model_->AddItemWithStringId( 262 context_menu_model_->AddItemWithStringId(
263 TOGGLE_PIN, 263 TOGGLE_PIN,
264 controller_->IsAppPinned(extension_id_) ? 264 controller_->IsAppPinned(extension_id_) ?
265 IDS_APP_LIST_CONTEXT_MENU_UNPIN : 265 IDS_APP_LIST_CONTEXT_MENU_UNPIN :
266 IDS_APP_LIST_CONTEXT_MENU_PIN); 266 IDS_APP_LIST_CONTEXT_MENU_PIN);
267 context_menu_model_->AddSeparator(); 267 context_menu_model_->AddSeparator(ui::NORMAL_SEPARATOR);
268 context_menu_model_->AddCheckItemWithStringId( 268 context_menu_model_->AddCheckItemWithStringId(
269 LAUNCH_TYPE_REGULAR_TAB, 269 LAUNCH_TYPE_REGULAR_TAB,
270 IDS_APP_CONTEXT_MENU_OPEN_REGULAR); 270 IDS_APP_CONTEXT_MENU_OPEN_REGULAR);
271 context_menu_model_->AddCheckItemWithStringId( 271 context_menu_model_->AddCheckItemWithStringId(
272 LAUNCH_TYPE_PINNED_TAB, 272 LAUNCH_TYPE_PINNED_TAB,
273 IDS_APP_CONTEXT_MENU_OPEN_PINNED); 273 IDS_APP_CONTEXT_MENU_OPEN_PINNED);
274 context_menu_model_->AddCheckItemWithStringId( 274 context_menu_model_->AddCheckItemWithStringId(
275 LAUNCH_TYPE_WINDOW, 275 LAUNCH_TYPE_WINDOW,
276 IDS_APP_CONTEXT_MENU_OPEN_WINDOW); 276 IDS_APP_CONTEXT_MENU_OPEN_WINDOW);
277 // Even though the launch type is Full Screen it is more accurately 277 // Even though the launch type is Full Screen it is more accurately
278 // described as Maximized in Ash. 278 // described as Maximized in Ash.
279 context_menu_model_->AddCheckItemWithStringId( 279 context_menu_model_->AddCheckItemWithStringId(
280 LAUNCH_TYPE_FULLSCREEN, 280 LAUNCH_TYPE_FULLSCREEN,
281 IDS_APP_CONTEXT_MENU_OPEN_MAXIMIZED); 281 IDS_APP_CONTEXT_MENU_OPEN_MAXIMIZED);
282 context_menu_model_->AddSeparator(); 282 context_menu_model_->AddSeparator(ui::NORMAL_SEPARATOR);
283 context_menu_model_->AddItemWithStringId(OPTIONS, IDS_NEW_TAB_APP_OPTIONS); 283 context_menu_model_->AddItemWithStringId(OPTIONS, IDS_NEW_TAB_APP_OPTIONS);
284 context_menu_model_->AddItemWithStringId(UNINSTALL, 284 context_menu_model_->AddItemWithStringId(UNINSTALL,
285 IDS_EXTENSIONS_UNINSTALL); 285 IDS_EXTENSIONS_UNINSTALL);
286 } 286 }
287 287
288 return context_menu_model_.get(); 288 return context_menu_model_.get();
289 } 289 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698