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

Unified Diff: content/public/common/content_switches.cc

Issue 22198004: Always enable FCM on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge up to r219022 Created 7 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 | « content/public/common/content_switches.h ('k') | content/public/test/browser_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/common/content_switches.cc
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index 63e94dfdc9038d3957ab8449eecdeab137890707..e407719ba736e5e7097c2bc4aa27ee4d594256d0 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -742,12 +742,6 @@ const char kSingleProcess[] = "single-process";
// http://crbug.com/159215.
const char kSitePerProcess[] = "site-per-process";
-// Skip gpu info collection, blacklist loading, and blacklist auto-update
-// scheduling at browser startup time.
-// Therefore, all GPU features are available, and about:gpu page shows empty
-// content. The switch is intended only for tests.
-const char kSkipGpuDataLoading[] = "skip-gpu-data-loading";
-
// Specifies the request key for the continuous speech recognition webservice.
const char kSpeechRecognitionWebserviceKey[] = "speech-service-key";
@@ -935,6 +929,16 @@ const char kChildCleanExit[] = "child-clean-exit";
extern const char kTestCompositor[] = "test-compositor";
#endif
+#if defined(OS_LINUX) || defined(OS_MACOSX)
+// Skip gpu info collection, blacklist loading, and blacklist auto-update
+// scheduling at browser startup time.
+// Therefore, all GPU features are available, and about:gpu page shows empty
+// content. The switch is intended only for tests.
+// TODO(gab): Remove this flag entriely and enable GPU blacklist usage on all
+// the bots (http://crbug.com/277242).
+const char kSkipGpuDataLoading[] = "skip-gpu-data-loading";
+#endif
+
// Don't dump stuff here, follow the same order as the header.
// Allows filters (SkImageFilter objects) to be sent between processes over IPC
« no previous file with comments | « content/public/common/content_switches.h ('k') | content/public/test/browser_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698