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

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: Updated Cardboard lib to v0.5.3 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 2334 matching lines...) Expand 10 before | Expand all | Expand 10 after
2345 MULTI_VALUE_TYPE(kDataSaverPromptChoices) 2345 MULTI_VALUE_TYPE(kDataSaverPromptChoices)
2346 }, 2346 },
2347 #endif // defined(OS_CHROMEOS) 2347 #endif // defined(OS_CHROMEOS)
2348 { 2348 {
2349 "supervised-user-safesites", 2349 "supervised-user-safesites",
2350 IDS_FLAGS_SUPERVISED_USER_SAFESITES_NAME, 2350 IDS_FLAGS_SUPERVISED_USER_SAFESITES_NAME,
2351 IDS_FLAGS_SUPERVISED_USER_SAFESITES_DESCRIPTION, 2351 IDS_FLAGS_SUPERVISED_USER_SAFESITES_DESCRIPTION,
2352 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, 2352 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
2353 MULTI_VALUE_TYPE(kSupervisedUserSafeSitesChoices) 2353 MULTI_VALUE_TYPE(kSupervisedUserSafeSitesChoices)
2354 }, 2354 },
2355 {
2356 "enable-webvr",
2357 IDS_FLAGS_ENABLE_WEBVR_NAME,
2358 IDS_FLAGS_ENABLE_WEBVR_DESCRIPTION,
2359 kOsAll,
2360 SINGLE_VALUE_TYPE(switches::kEnableWebVR)
2361 },
2362
2355 // NOTE: Adding new command-line switches requires adding corresponding 2363 // NOTE: Adding new command-line switches requires adding corresponding
2356 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2364 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2357 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2365 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2358 }; 2366 };
2359 2367
2360 const Experiment* experiments = kExperiments; 2368 const Experiment* experiments = kExperiments;
2361 size_t num_experiments = arraysize(kExperiments); 2369 size_t num_experiments = arraysize(kExperiments);
2362 2370
2363 // Stores and encapsulates the little state that about:flags has. 2371 // Stores and encapsulates the little state that about:flags has.
2364 class FlagsState { 2372 class FlagsState {
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
2933 } 2941 }
2934 2942
2935 const Experiment* GetExperiments(size_t* count) { 2943 const Experiment* GetExperiments(size_t* count) {
2936 *count = num_experiments; 2944 *count = num_experiments;
2937 return experiments; 2945 return experiments;
2938 } 2946 }
2939 2947
2940 } // namespace testing 2948 } // namespace testing
2941 2949
2942 } // namespace about_flags 2950 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698