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

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

Issue 907473002: Polish UI of bookmark app creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Feedback Created 5 years, 10 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
« no previous file with comments | « chrome/browser/ui/app_list/app_context_menu.cc ('k') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « chrome/browser/ui/app_list/app_context_menu.cc ('k') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698