OLD | NEW |
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 16 matching lines...) Expand all Loading... |
27 AddSeparator(); | 27 AddSeparator(); |
28 AddCheckItemWithStringId( | 28 AddCheckItemWithStringId( |
29 LAUNCH_TYPE_REGULAR_TAB, | 29 LAUNCH_TYPE_REGULAR_TAB, |
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 // Even though the launch type is Full Screen it is more accurately |
| 38 // described as Maximized in Ash. |
37 AddCheckItemWithStringId( | 39 AddCheckItemWithStringId( |
38 LAUNCH_TYPE_FULLSCREEN, | 40 LAUNCH_TYPE_FULLSCREEN, |
39 IDS_APP_CONTEXT_MENU_OPEN_FULLSCREEN); | 41 IDS_APP_CONTEXT_MENU_OPEN_MAXIMIZED); |
40 } else if (item_.type == ash::TYPE_BROWSER_SHORTCUT) { | 42 } else if (item_.type == ash::TYPE_BROWSER_SHORTCUT) { |
41 AddItem(MENU_NEW_WINDOW, | 43 AddItem(MENU_NEW_WINDOW, |
42 l10n_util::GetStringUTF16(IDS_LAUNCHER_NEW_WINDOW)); | 44 l10n_util::GetStringUTF16(IDS_LAUNCHER_NEW_WINDOW)); |
43 if (!delegate_->IsLoggedInAsGuest()) { | 45 if (!delegate_->IsLoggedInAsGuest()) { |
44 AddItem(MENU_NEW_INCOGNITO_WINDOW, | 46 AddItem(MENU_NEW_INCOGNITO_WINDOW, |
45 l10n_util::GetStringUTF16(IDS_LAUNCHER_NEW_INCOGNITO_WINDOW)); | 47 l10n_util::GetStringUTF16(IDS_LAUNCHER_NEW_INCOGNITO_WINDOW)); |
46 } | 48 } |
47 } else { | 49 } else { |
48 AddItem(MENU_OPEN, delegate->GetTitle(item_)); | 50 AddItem(MENU_OPEN, delegate->GetTitle(item_)); |
49 if (delegate->IsOpen(item_.id)) { | 51 if (delegate->IsOpen(item_.id)) { |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
118 ash::LauncherContextMenu::ToggleAutoHideMenu(); | 120 ash::LauncherContextMenu::ToggleAutoHideMenu(); |
119 break; | 121 break; |
120 case MENU_NEW_WINDOW: | 122 case MENU_NEW_WINDOW: |
121 delegate_->CreateNewWindow(); | 123 delegate_->CreateNewWindow(); |
122 break; | 124 break; |
123 case MENU_NEW_INCOGNITO_WINDOW: | 125 case MENU_NEW_INCOGNITO_WINDOW: |
124 delegate_->CreateNewIncognitoWindow(); | 126 delegate_->CreateNewIncognitoWindow(); |
125 break; | 127 break; |
126 } | 128 } |
127 } | 129 } |
OLD | NEW |