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

Unified Diff: chrome/browser/ui/app_list/app_context_menu_unittest.cc

Issue 2131463002: Purge the App Launcher code from Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Zap mac-specific icon assets Created 4 years, 5 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
Index: chrome/browser/ui/app_list/app_context_menu_unittest.cc
diff --git a/chrome/browser/ui/app_list/app_context_menu_unittest.cc b/chrome/browser/ui/app_list/app_context_menu_unittest.cc
index dcecb11724415f730e704ef6c29f858aac65cad5..e864e499e6afe8c35de32356f8439e78bfdfba31 100644
--- a/chrome/browser/ui/app_list/app_context_menu_unittest.cc
+++ b/chrome/browser/ui/app_list/app_context_menu_unittest.cc
@@ -219,20 +219,12 @@ class AppContextMenuTest : public AppListTestBase {
if (!platform_app) {
if (extensions::util::CanHostedAppsOpenInWindows() &&
extensions::util::IsNewBookmarkAppsEnabled()) {
- // MACOS has different logic for this case.
- // See chrome/browser/extensions/launch_util.cc for more details.
- bool checked = launch_type == extensions::LAUNCH_TYPE_WINDOW;
-#if !defined(OS_MACOSX)
- checked |= launch_type == extensions::LAUNCH_TYPE_FULLSCREEN;
-#endif
+ bool checked = launch_type == extensions::LAUNCH_TYPE_WINDOW ||
+ launch_type == extensions::LAUNCH_TYPE_FULLSCREEN;
states.push_back(MenuState(
app_list::AppContextMenu::USE_LAUNCH_TYPE_WINDOW, true, checked));
} else if (!extensions::util::IsNewBookmarkAppsEnabled()) {
bool regular_checked = launch_type == extensions::LAUNCH_TYPE_REGULAR;
-#if defined(OS_MACOSX)
- regular_checked |= (!extensions::util::CanHostedAppsOpenInWindows() &&
- launch_type == extensions::LAUNCH_TYPE_WINDOW);
-#endif
states.push_back(MenuState(
app_list::AppContextMenu::USE_LAUNCH_TYPE_REGULAR,
true,

Powered by Google App Engine
This is Rietveld 408576698