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

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: Moved cardboard-java gyp and gn config into third_party 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 2353 matching lines...) Expand 10 before | Expand all | Expand 10 after
2364 MULTI_VALUE_TYPE(kDataSaverPromptChoices) 2364 MULTI_VALUE_TYPE(kDataSaverPromptChoices)
2365 }, 2365 },
2366 #endif // defined(OS_CHROMEOS) 2366 #endif // defined(OS_CHROMEOS)
2367 { 2367 {
2368 "supervised-user-safesites", 2368 "supervised-user-safesites",
2369 IDS_FLAGS_SUPERVISED_USER_SAFESITES_NAME, 2369 IDS_FLAGS_SUPERVISED_USER_SAFESITES_NAME,
2370 IDS_FLAGS_SUPERVISED_USER_SAFESITES_DESCRIPTION, 2370 IDS_FLAGS_SUPERVISED_USER_SAFESITES_DESCRIPTION,
2371 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, 2371 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
2372 MULTI_VALUE_TYPE(kSupervisedUserSafeSitesChoices) 2372 MULTI_VALUE_TYPE(kSupervisedUserSafeSitesChoices)
2373 }, 2373 },
2374 {
2375 "enable-webvr",
2376 IDS_FLAGS_ENABLE_WEBVR_NAME,
2377 IDS_FLAGS_ENABLE_WEBVR_DESCRIPTION,
2378 kOsAll,
2379 SINGLE_VALUE_TYPE(switches::kEnableWebVR)
2380 },
2381
2374 // NOTE: Adding new command-line switches requires adding corresponding 2382 // NOTE: Adding new command-line switches requires adding corresponding
2375 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2383 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2376 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2384 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2377 }; 2385 };
2378 2386
2379 const Experiment* experiments = kExperiments; 2387 const Experiment* experiments = kExperiments;
2380 size_t num_experiments = arraysize(kExperiments); 2388 size_t num_experiments = arraysize(kExperiments);
2381 2389
2382 // Stores and encapsulates the little state that about:flags has. 2390 // Stores and encapsulates the little state that about:flags has.
2383 class FlagsState { 2391 class FlagsState {
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
2952 } 2960 }
2953 2961
2954 const Experiment* GetExperiments(size_t* count) { 2962 const Experiment* GetExperiments(size_t* count) {
2955 *count = num_experiments; 2963 *count = num_experiments;
2956 return experiments; 2964 return experiments;
2957 } 2965 }
2958 2966
2959 } // namespace testing 2967 } // namespace testing
2960 2968
2961 } // namespace about_flags 2969 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698