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

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: Missed one cardboard reference Created 5 years, 6 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 1974 matching lines...) Expand 10 before | Expand all | Expand 10 after
1985 kOsMac, 1985 kOsMac,
1986 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppInfoDialogMac, 1986 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppInfoDialogMac,
1987 switches::kDisableAppInfoDialogMac)}, 1987 switches::kDisableAppInfoDialogMac)},
1988 {"mac-views-native-app-windows", 1988 {"mac-views-native-app-windows",
1989 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_NAME, 1989 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_NAME,
1990 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_DESCRIPTION, 1990 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_DESCRIPTION,
1991 kOsMac, 1991 kOsMac,
1992 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMacViewsNativeAppWindows, 1992 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMacViewsNativeAppWindows,
1993 switches::kDisableMacViewsNativeAppWindows)}, 1993 switches::kDisableMacViewsNativeAppWindows)},
1994 #endif 1994 #endif
1995 #if defined(ENABLE_WEBVR)
1996 {"enable-webvr",
1997 IDS_FLAGS_ENABLE_WEBVR_NAME,
1998 IDS_FLAGS_ENABLE_WEBVR_DESCRIPTION,
1999 kOsAll,
2000 SINGLE_VALUE_TYPE(switches::kEnableWebVR)},
2001 #endif
1995 // NOTE: Adding new command-line switches requires adding corresponding 2002 // NOTE: Adding new command-line switches requires adding corresponding
1996 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2003 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
1997 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2004 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
1998 }; 2005 };
1999 2006
2000 const Experiment* experiments = kExperiments; 2007 const Experiment* experiments = kExperiments;
2001 size_t num_experiments = arraysize(kExperiments); 2008 size_t num_experiments = arraysize(kExperiments);
2002 2009
2003 // Stores and encapsulates the little state that about:flags has. 2010 // Stores and encapsulates the little state that about:flags has.
2004 class FlagsState { 2011 class FlagsState {
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
2617 } 2624 }
2618 2625
2619 const Experiment* GetExperiments(size_t* count) { 2626 const Experiment* GetExperiments(size_t* count) {
2620 *count = num_experiments; 2627 *count = num_experiments;
2621 return experiments; 2628 return experiments;
2622 } 2629 }
2623 2630
2624 } // namespace testing 2631 } // namespace testing
2625 2632
2626 } // namespace about_flags 2633 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/login/chrome_restart_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698