Polish UI of bookmark app creation.

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 92 matching lines @@
         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::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);
+          AddCheckItemWithStringId(LAUNCH_TYPE_WINDOW,
+                                   IDS_APP_CONTEXT_MENU_OPEN_WINDOW);
         } else {
           AddCheckItemWithStringId(
               LAUNCH_TYPE_REGULAR_TAB,
               IDS_APP_CONTEXT_MENU_OPEN_REGULAR);
           AddCheckItemWithStringId(
               LAUNCH_TYPE_PINNED_TAB,
               IDS_APP_CONTEXT_MENU_OPEN_PINNED);
           AddCheckItemWithStringId(
               LAUNCH_TYPE_WINDOW,
               IDS_APP_CONTEXT_MENU_OPEN_WINDOW);
@@ skipping 177 matching lines @@
       break;
     case MENU_PIN:
       controller_->TogglePinned(item_.id);
       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;
+    case LAUNCH_TYPE_REGULAR_TAB:
+      controller_->SetLaunchType(item_.id, extensions::LAUNCH_TYPE_REGULAR);
+      break;
+    case LAUNCH_TYPE_WINDOW: {
+      extensions::LaunchType launch_type = extensions::LAUNCH_TYPE_WINDOW;
       // 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;
+                              extensions::LAUNCH_TYPE_WINDOW
+                          ? extensions::LAUNCH_TYPE_REGULAR
+                          : extensions::LAUNCH_TYPE_WINDOW;
       }
       controller_->SetLaunchType(item_.id, launch_type);
       break;
     }
-    case LAUNCH_TYPE_WINDOW:
-      controller_->SetLaunchType(item_.id, extensions::LAUNCH_TYPE_WINDOW);
-      break;
     case LAUNCH_TYPE_FULLSCREEN:
       controller_->SetLaunchType(item_.id, extensions::LAUNCH_TYPE_FULLSCREEN);
       break;
     case MENU_AUTO_HIDE:
       controller_->ToggleShelfAutoHideBehavior(root_window_);
       break;
     case MENU_NEW_WINDOW:
       controller_->CreateNewWindow();
       break;
     case MENU_NEW_INCOGNITO_WINDOW:
       controller_->CreateNewIncognitoWindow();
       break;
     case MENU_ALIGNMENT_MENU:
       break;
 #if defined(OS_CHROMEOS)
     case MENU_CHANGE_WALLPAPER:
       ash::Shell::GetInstance()->user_wallpaper_delegate()->
           OpenSetWallpaperPage();
       break;
 #endif
     default:
       extension_items_->ExecuteCommand(command_id, NULL,
                                        content::ContextMenuParams());
   }
 }