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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/about_flags.cc

Issue 2681663004: Mustash: Ignore --mash flag when comparing flags in UserSessionManager. (Closed)
Patch Set: Addressing feedback Created 3 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
« chrome/app/mash/mash_runner.cc ('K') | « chrome/app/mash/mash_runner.cc ('k') | chrome/browser/chromeos/login/session/user_session_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 4fd3c68be996609d0ccc1711aa0591949014b47f..f96b4b51aad2f5348ba99fdf6d2c75656307523f 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -937,9 +937,11 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_RUN_ALL_FLASH_IN_ALLOW_MODE_DESCRIPTION, kOsDesktop,
FEATURE_VALUE_TYPE(features::kRunAllFlashInAllowMode)},
#endif // ENABLE_PLUGINS
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
{"mash", IDS_FLAGS_USE_MASH_NAME, IDS_FLAGS_USE_MASH_DESCRIPTION, kOsCrOS,
- SINGLE_VALUE_TYPE("mash")},
+ SINGLE_VALUE_TYPE(switches::kMash)},
+#endif // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
+#if defined(OS_CHROMEOS)
{"allow-touchpad-three-finger-click",
IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME,
IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, kOsCrOS,
« chrome/app/mash/mash_runner.cc ('K') | « chrome/app/mash/mash_runner.cc ('k') | chrome/browser/chromeos/login/session/user_session_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698