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

Unified Diff: chrome/browser/about_flags.cc

Issue 1365963004: Don't compile download notification code on !CrOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: images and strings Created 5 years, 3 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/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index c2892723973c52261cfe3f4f3d802b1188feb469..5032dff98bd5fa916272cfc0c5f6e2c2ba0ea755 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -420,7 +420,6 @@ const Experiment::Choice kTopChromeMaterialDesignChoices[] = {
#endif
#if defined(OS_CHROMEOS)
-
const Experiment::Choice kAshMaterialDesignInkDropAnimationSpeed[] = {
{IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
{IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_FAST,
@@ -480,7 +479,6 @@ const Experiment::Choice kGestureEditingChoices[] = {
keyboard::switches::kGestureEditing,
keyboard::switches::kGestureEditingEnabled},
};
-#endif
const Experiment::Choice kDownloadNotificationChoices[] = {
{ IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
@@ -491,6 +489,7 @@ const Experiment::Choice kDownloadNotificationChoices[] = {
switches::kEnableDownloadNotification,
"disabled" }
};
+#endif
const Experiment::Choice kSupervisedUserSafeSitesChoices[] = {
{ IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
@@ -874,11 +873,13 @@ const Experiment kExperiments[] = {
IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION,
kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption)},
+#if defined(OS_CHROMEOS)
{"enable-download-notification",
IDS_FLAGS_ENABLE_DOWNLOAD_NOTIFICATION_NAME,
IDS_FLAGS_ENABLE_DOWNLOAD_NOTIFICATION_DESCRIPTION,
- kOsDesktop,
+ kOsCrOS,
MULTI_VALUE_TYPE(kDownloadNotificationChoices)},
+#endif
#if defined(ENABLE_PLUGINS)
{"allow-nacl-socket-api",
IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME,

Powered by Google App Engine
This is Rietveld 408576698