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

Unified Diff: chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc

Issue 1300763002: Add a flag to enable open in window for hosted apps on Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@disable-new-bookmark-apps
Patch Set: Addressing nits Created 5 years, 4 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/cocoa/browser_window_cocoa.mm ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 61892466e4ade1c5fa17cb396b22ffd783652801..531d5f9551ce61f398abd59032967ef0f40e0433 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
@@ -66,9 +66,11 @@ LaunchOptionsComboboxModel::LaunchOptionsComboboxModel() {
launch_type_messages_.push_back(
l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_TAB));
- launch_types_.push_back(extensions::LAUNCH_TYPE_WINDOW);
- launch_type_messages_.push_back(
- l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_WINDOW));
+ if (extensions::util::CanHostedAppsOpenInWindows()) {
+ launch_types_.push_back(extensions::LAUNCH_TYPE_WINDOW);
+ launch_type_messages_.push_back(
+ l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_WINDOW));
+ }
} else {
launch_types_.push_back(extensions::LAUNCH_TYPE_REGULAR);
launch_type_messages_.push_back(
@@ -78,6 +80,11 @@ LaunchOptionsComboboxModel::LaunchOptionsComboboxModel() {
launch_type_messages_.push_back(
l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_PINNED));
+ if (extensions::util::CanHostedAppsOpenInWindows()) {
+ launch_types_.push_back(extensions::LAUNCH_TYPE_WINDOW);
+ launch_type_messages_.push_back(
+ l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_WINDOW));
+ }
#if defined(OS_MACOSX)
// Mac does not support standalone web app browser windows or maximize
// unless the new bookmark apps system is enabled.
@@ -85,10 +92,6 @@ LaunchOptionsComboboxModel::LaunchOptionsComboboxModel() {
launch_type_messages_.push_back(
l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_FULLSCREEN));
#else
- launch_types_.push_back(extensions::LAUNCH_TYPE_WINDOW);
- launch_type_messages_.push_back(
- l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_WINDOW));
-
// Even though the launch type is Full Screen, it is more accurately
// described as Maximized in non-Mac OSs.
launch_types_.push_back(extensions::LAUNCH_TYPE_FULLSCREEN);
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_cocoa.mm ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698