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 86e62738be37563e892ed29086fef3fb20dc2c9e..5764d37f7490402c8840544b24344469db86fdc5 100644 |
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc |
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc |
@@ -110,9 +110,8 @@ void LauncherContextMenu::Init() { |
// 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, |
@@ -310,23 +309,22 @@ void LauncherContextMenu::ExecuteCommand(int command_id, int event_flags) { |
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; |