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

Unified Diff: chrome/browser/ui/ash/launcher/launcher_context_menu.cc

Issue 883603002: Rename StreamlinedHostedApps to NewBookmarkApps in the code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments and variables Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/launcher/launcher_context_menu.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
index ad6d9ae427dc24be1702f8ff223d061851fe6ab0..86e62738be37563e892ed29086fef3fb20dc2c9e 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
@@ -106,10 +106,10 @@ void LauncherContextMenu::Init() {
if (!controller_->IsPlatformApp(item_.id) &&
item_.type != ash::TYPE_WINDOWED_APP) {
AddSeparator(ui::NORMAL_SEPARATOR);
- if (extensions::util::IsStreamlinedHostedAppsEnabled()) {
- // Streamlined hosted apps launch in a window by default. This menu
- // item is re-interpreted as a single, toggle-able option to launch
- // the hosted app as a tab.
+ if (extensions::util::IsNewBookmarkAppsEnabled()) {
+ // With bookmark apps enabled, hosted apps launch in a window by
+ // default. This menu item is re-interpreted as a single, toggle-able
+ // option to launch the hosted app as a tab.
AddCheckItemWithStringId(
LAUNCH_TYPE_REGULAR_TAB,
IDS_APP_CONTEXT_MENU_OPEN_TAB);
@@ -313,9 +313,9 @@ void LauncherContextMenu::ExecuteCommand(int command_id, int event_flags) {
case LAUNCH_TYPE_REGULAR_TAB: {
extensions::LaunchType launch_type =
extensions::LAUNCH_TYPE_REGULAR;
- // Streamlined hosted apps can only toggle between LAUNCH_WINDOW and
- // LAUNCH_REGULAR.
- if (extensions::util::IsStreamlinedHostedAppsEnabled()) {
+ // With bookmark apps enabled, hosted apps can only toggle between
+ // LAUNCH_WINDOW and LAUNCH_REGULAR.
+ if (extensions::util::IsNewBookmarkAppsEnabled()) {
launch_type = controller_->GetLaunchType(item_.id) ==
extensions::LAUNCH_TYPE_REGULAR
? extensions::LAUNCH_TYPE_WINDOW

Powered by Google App Engine
This is Rietveld 408576698