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

Side by Side Diff: chrome/browser/about_flags.cc

Issue 759403002: Add --enable-seccomp-filter-sandbox to about:flags on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years 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 unified diff | Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/content_renderer.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/about_flags.h" 5 #include "chrome/browser/about_flags.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 2023 matching lines...) Expand 10 before | Expand all | Expand 10 after
2034 }, 2034 },
2035 #if defined(OS_CHROMEOS) 2035 #if defined(OS_CHROMEOS)
2036 { 2036 {
2037 "enable-captive-portal-bypass-proxy", 2037 "enable-captive-portal-bypass-proxy",
2038 IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_NAME, 2038 IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_NAME,
2039 IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION, 2039 IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION,
2040 kOsCrOS, 2040 kOsCrOS,
2041 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCaptivePortalBypassProxy) 2041 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCaptivePortalBypassProxy)
2042 }, 2042 },
2043 #endif // defined(OS_CHROMEOS) 2043 #endif // defined(OS_CHROMEOS)
2044 #if defined(OS_ANDROID)
2045 {
2046 "enable-seccomp-filter-sandbox",
2047 IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_NAME,
2048 IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_DESCRIPTION,
2049 kOsAndroid,
2050 SINGLE_VALUE_TYPE(switches::kEnableSeccompFilterSandbox)
2051 },
2052 #endif
2044 2053
2045 // NOTE: Adding new command-line switches requires adding corresponding 2054 // NOTE: Adding new command-line switches requires adding corresponding
2046 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2055 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2047 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2056 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2048 }; 2057 };
2049 2058
2050 const Experiment* experiments = kExperiments; 2059 const Experiment* experiments = kExperiments;
2051 size_t num_experiments = arraysize(kExperiments); 2060 size_t num_experiments = arraysize(kExperiments);
2052 2061
2053 // Stores and encapsulates the little state that about:flags has. 2062 // Stores and encapsulates the little state that about:flags has.
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
2613 } 2622 }
2614 2623
2615 const Experiment* GetExperiments(size_t* count) { 2624 const Experiment* GetExperiments(size_t* count) {
2616 *count = num_experiments; 2625 *count = num_experiments;
2617 return experiments; 2626 return experiments;
2618 } 2627 }
2619 2628
2620 } // namespace testing 2629 } // namespace testing
2621 2630
2622 } // namespace about_flags 2631 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/content_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698