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

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

Issue 829803003: Adding Chrome-side WebVR interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More nit squashing Created 5 years, 8 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 unified diff | Download patch
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 2267 matching lines...) Expand 10 before | Expand all | Expand 10 after
2278 kOsAll, 2278 kOsAll,
2279 SINGLE_VALUE_TYPE(switches::kEnableMediaRouter) 2279 SINGLE_VALUE_TYPE(switches::kEnableMediaRouter)
2280 }, 2280 },
2281 { 2281 {
2282 "enable-cert-collection", 2282 "enable-cert-collection",
2283 IDS_ENABLE_INVALID_CERT_COLLECTION, 2283 IDS_ENABLE_INVALID_CERT_COLLECTION,
2284 IDS_ENABLE_INVALID_CERT_COLLECTION_DESCRIPTION, 2284 IDS_ENABLE_INVALID_CERT_COLLECTION_DESCRIPTION,
2285 kOsAll, 2285 kOsAll,
2286 SINGLE_VALUE_TYPE(switches::kEnableInvalidCertCollection) 2286 SINGLE_VALUE_TYPE(switches::kEnableInvalidCertCollection)
2287 }, 2287 },
2288 {
2289 "enable-webvr",
2290 IDS_FLAGS_ENABLE_WEBVR_NAME,
2291 IDS_FLAGS_ENABLE_WEBVR_DESCRIPTION,
2292 kOsAll,
2293 SINGLE_VALUE_TYPE(switches::kEnableWebVR)
2294 },
2288 2295
2289 // NOTE: Adding new command-line switches requires adding corresponding 2296 // NOTE: Adding new command-line switches requires adding corresponding
2290 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2297 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2291 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2298 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2292 }; 2299 };
2293 2300
2294 const Experiment* experiments = kExperiments; 2301 const Experiment* experiments = kExperiments;
2295 size_t num_experiments = arraysize(kExperiments); 2302 size_t num_experiments = arraysize(kExperiments);
2296 2303
2297 // Stores and encapsulates the little state that about:flags has. 2304 // Stores and encapsulates the little state that about:flags has.
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
2867 } 2874 }
2868 2875
2869 const Experiment* GetExperiments(size_t* count) { 2876 const Experiment* GetExperiments(size_t* count) {
2870 *count = num_experiments; 2877 *count = num_experiments;
2871 return experiments; 2878 return experiments;
2872 } 2879 }
2873 2880
2874 } // namespace testing 2881 } // namespace testing
2875 2882
2876 } // namespace about_flags 2883 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698