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

Side by Side Diff: chrome/browser/ui/views/ash/launcher/launcher_context_menu.cc

Issue 10139025: Add support for a context menu on the browser shortcut icon (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Only have new api on ChromeLauncherDelegate Created 8 years, 8 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/views/ash/launcher/launcher_context_menu.h" 5 #include "chrome/browser/ui/views/ash/launcher/launcher_context_menu.h"
6 6
7 #include "ash/launcher/launcher_context_menu.h" 7 #include "ash/launcher/launcher_context_menu.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "chrome/browser/extensions/extension_prefs.h" 9 #include "chrome/browser/extensions/extension_prefs.h"
10 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h" 10 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h"
(...skipping 19 matching lines...) Expand all
30 IDS_APP_CONTEXT_MENU_OPEN_REGULAR); 30 IDS_APP_CONTEXT_MENU_OPEN_REGULAR);
31 AddCheckItemWithStringId( 31 AddCheckItemWithStringId(
32 LAUNCH_TYPE_PINNED_TAB, 32 LAUNCH_TYPE_PINNED_TAB,
33 IDS_APP_CONTEXT_MENU_OPEN_PINNED); 33 IDS_APP_CONTEXT_MENU_OPEN_PINNED);
34 AddCheckItemWithStringId( 34 AddCheckItemWithStringId(
35 LAUNCH_TYPE_WINDOW, 35 LAUNCH_TYPE_WINDOW,
36 IDS_APP_CONTEXT_MENU_OPEN_WINDOW); 36 IDS_APP_CONTEXT_MENU_OPEN_WINDOW);
37 AddCheckItemWithStringId( 37 AddCheckItemWithStringId(
38 LAUNCH_TYPE_FULLSCREEN, 38 LAUNCH_TYPE_FULLSCREEN,
39 IDS_APP_CONTEXT_MENU_OPEN_FULLSCREEN); 39 IDS_APP_CONTEXT_MENU_OPEN_FULLSCREEN);
40 } else if (item_.type == ash::TYPE_BROWSER_SHORTCUT) {
41 AddItem(MENU_NEW_WINDOW,
42 l10n_util::GetStringUTF16(IDS_LAUNCHER_NEW_WINDOW));
43 if (!delegate_->IsLoggedInAsGuest()) {
44 AddItem(MENU_NEW_INCOGNITO_WINDOW,
45 l10n_util::GetStringUTF16(IDS_LAUNCHER_NEW_INCOGNITO_WINDOW));
46 }
40 } else { 47 } else {
41 AddItem(MENU_OPEN, delegate->GetTitle(item_)); 48 AddItem(MENU_OPEN, delegate->GetTitle(item_));
42 if (delegate->IsOpen(item_.id)) { 49 if (delegate->IsOpen(item_.id)) {
43 AddItem(MENU_CLOSE, 50 AddItem(MENU_CLOSE,
44 l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_CLOSE)); 51 l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_CLOSE));
45 } 52 }
46 } 53 }
47 AddSeparator(); 54 AddSeparator();
48 } 55 }
49 AddCheckItemWithStringId( 56 AddCheckItemWithStringId(
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 case LAUNCH_TYPE_REGULAR_TAB: 108 case LAUNCH_TYPE_REGULAR_TAB:
102 delegate_->SetLaunchType(item_.id, ExtensionPrefs::LAUNCH_REGULAR); 109 delegate_->SetLaunchType(item_.id, ExtensionPrefs::LAUNCH_REGULAR);
103 break; 110 break;
104 case LAUNCH_TYPE_WINDOW: 111 case LAUNCH_TYPE_WINDOW:
105 delegate_->SetLaunchType(item_.id, ExtensionPrefs::LAUNCH_WINDOW); 112 delegate_->SetLaunchType(item_.id, ExtensionPrefs::LAUNCH_WINDOW);
106 break; 113 break;
107 case LAUNCH_TYPE_FULLSCREEN: 114 case LAUNCH_TYPE_FULLSCREEN:
108 delegate_->SetLaunchType(item_.id, ExtensionPrefs::LAUNCH_FULLSCREEN); 115 delegate_->SetLaunchType(item_.id, ExtensionPrefs::LAUNCH_FULLSCREEN);
109 break; 116 break;
110 case MENU_AUTO_HIDE: 117 case MENU_AUTO_HIDE:
111 return ash::LauncherContextMenu::ToggleAutoHideMenu(); 118 ash::LauncherContextMenu::ToggleAutoHideMenu();
119 break;
120 case MENU_NEW_WINDOW:
121 delegate_->CreateNewWindow();
122 break;
123 case MENU_NEW_INCOGNITO_WINDOW:
124 delegate_->CreateNewIncognitoWindow();
125 break;
112 } 126 }
113 } 127 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698