Rename StreamlinedHostedApps to NewBookmarkApps in the code.

chrome/browser/ui/ash/launcher/launcher_context_menu.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
 
 #include <string>
 
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/metrics/user_metrics_recorder.h"
@@ skipping 88 matching lines @@
           l10n_util::GetStringUTF16(controller_->IsPinned(item_.id) ?
                                     IDS_LAUNCHER_CONTEXT_MENU_UNPIN :
                                     IDS_LAUNCHER_CONTEXT_MENU_PIN));
       if (controller_->IsOpen(item_.id)) {
         AddItem(MENU_CLOSE,
                 l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_CLOSE));
       }
       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);
         } else {
           AddCheckItemWithStringId(
               LAUNCH_TYPE_REGULAR_TAB,
               IDS_APP_CONTEXT_MENU_OPEN_REGULAR);
           AddCheckItemWithStringId(
               LAUNCH_TYPE_PINNED_TAB,
               IDS_APP_CONTEXT_MENU_OPEN_PINNED);
@@ skipping 183 matching lines @@
       break;
     case MENU_INSTALL:
       controller_->Install(item_.id);
       break;
     case LAUNCH_TYPE_PINNED_TAB:
       controller_->SetLaunchType(item_.id, extensions::LAUNCH_TYPE_PINNED);
       break;
     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
                 : extensions::LAUNCH_TYPE_REGULAR;
       }
       controller_->SetLaunchType(item_.id, launch_type);
       break;
     }
     case LAUNCH_TYPE_WINDOW:
       controller_->SetLaunchType(item_.id, extensions::LAUNCH_TYPE_WINDOW);
@@ skipping 16 matching lines @@
     case MENU_CHANGE_WALLPAPER:
       ash::Shell::GetInstance()->user_wallpaper_delegate()->
           OpenSetWallpaperPage();
       break;
 #endif
     default:
       extension_items_->ExecuteCommand(command_id, NULL,
                                        content::ContextMenuParams());
   }
 }