Rename StreamlinedHostedApps to NewBookmarkApps in the code.

chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc

Index: chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc
index e88693fa18dea83e00eda8fd2d0391d8f3147744..61892466e4ade1c5fa17cb396b22ffd783652801 100644
--- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc
+++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc
@@ -58,16 +58,14 @@ class LaunchOptionsComboboxModel : public ui::ComboboxModel {
 };
 
 LaunchOptionsComboboxModel::LaunchOptionsComboboxModel() {
-  if (extensions::util::IsStreamlinedHostedAppsEnabled()) {
-    // Streamlined hosted apps can only toggle between LAUNCH_TYPE_WINDOW and
-    // LAUNCH_TYPE_REGULAR.
+  if (extensions::util::IsNewBookmarkAppsEnabled()) {
+    // When bookmark apps are enabled, hosted apps can only toggle between
+    // LAUNCH_TYPE_WINDOW and LAUNCH_TYPE_REGULAR.
     // TODO(sashab): Use a checkbox for this choice instead of combobox.
     launch_types_.push_back(extensions::LAUNCH_TYPE_REGULAR);
     launch_type_messages_.push_back(
         l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_TAB));
 
-    // Although LAUNCH_TYPE_WINDOW doesn't work on Mac, the streamlined hosted
-    // apps flag isn't available on Mac, so we must be on a non-Mac OS.

[benwells, 2015/01/27 10:39:35]

This comment is now incorrect.

     launch_types_.push_back(extensions::LAUNCH_TYPE_WINDOW);
     launch_type_messages_.push_back(
         l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_WINDOW));
@@ -81,7 +79,8 @@ LaunchOptionsComboboxModel::LaunchOptionsComboboxModel() {
         l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_PINNED));
 
 #if defined(OS_MACOSX)
-    // Mac does not support standalone web app browser windows or maximize.
+    // Mac does not support standalone web app browser windows or maximize
+    // unless the new bookmark apps system is enabled.
     launch_types_.push_back(extensions::LAUNCH_TYPE_FULLSCREEN);
     launch_type_messages_.push_back(
         l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_FULLSCREEN));