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

Unified Diff: chrome/browser/about_flags.cc

Issue 1419083012: Create a field trial for Seccomp-BPF on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix define issue Created 5 years, 1 month 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 458e3f9b86730c50dd619012d9ad3ec437b03d1b..9da80aec2a28d9cf18282d0de70a409a2a276dd1 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -58,7 +58,9 @@
#include "ui/native_theme/native_theme_switches.h"
#include "ui/views/views_switches.h"
-#if !defined(OS_ANDROID)
+#if defined(OS_ANDROID)
+#include "content/public/common/sandbox_init.h"
+#else
#include "ui/message_center/message_center_switches.h"
#endif
@@ -1755,11 +1757,11 @@ const FeatureEntry kFeatureEntries[] = {
SINGLE_VALUE_TYPE(chromeos::switches::kDisableCaptivePortalBypassProxy)},
#endif // defined(OS_CHROMEOS)
#if defined(OS_ANDROID)
- {"enable-seccomp-filter-sandbox",
+ {"enable-seccomp-sandbox-android",
IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_NAME,
IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_DESCRIPTION,
kOsAndroid,
- SINGLE_VALUE_TYPE(switches::kEnableSeccompFilterSandbox)},
+ FEATURE_VALUE_TYPE(content::kSeccompSandboxAndroidFeature)},
#endif
{"enable-touch-hover",
IDS_FLAGS_ENABLE_TOUCH_HOVER_NAME,
« no previous file with comments | « no previous file | content/browser/renderer_host/render_process_host_impl.cc » ('j') | content/public/common/sandbox_init.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698