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

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

Issue 967733005: [ozone] Add an about flag to enable ozone overlay testing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 #endif 59 #endif
60 60
61 #if defined(ENABLE_APP_LIST) 61 #if defined(ENABLE_APP_LIST)
62 #include "ui/app_list/app_list_switches.h" 62 #include "ui/app_list/app_list_switches.h"
63 #endif 63 #endif
64 64
65 #if defined(ENABLE_EXTENSIONS) 65 #if defined(ENABLE_EXTENSIONS)
66 #include "extensions/common/switches.h" 66 #include "extensions/common/switches.h"
67 #endif 67 #endif
68 68
69 #if defined(USE_OZONE)
70 #include "ui/ozone/public/ozone_switches.h"
71 #endif
72
69 namespace about_flags { 73 namespace about_flags {
70 74
71 // Macros to simplify specifying the type. 75 // Macros to simplify specifying the type.
72 #define SINGLE_VALUE_TYPE_AND_VALUE(command_line_switch, switch_value) \ 76 #define SINGLE_VALUE_TYPE_AND_VALUE(command_line_switch, switch_value) \
73 Experiment::SINGLE_VALUE, \ 77 Experiment::SINGLE_VALUE, \
74 command_line_switch, switch_value, NULL, NULL, NULL, 0 78 command_line_switch, switch_value, NULL, NULL, NULL, 0
75 #define SINGLE_VALUE_TYPE(command_line_switch) \ 79 #define SINGLE_VALUE_TYPE(command_line_switch) \
76 SINGLE_VALUE_TYPE_AND_VALUE(command_line_switch, "") 80 SINGLE_VALUE_TYPE_AND_VALUE(command_line_switch, "")
77 #define ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(enable_switch, enable_value, \ 81 #define ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(enable_switch, enable_value, \
78 disable_switch, disable_value) \ 82 disable_switch, disable_value) \
(...skipping 2122 matching lines...) Expand 10 before | Expand all | Expand 10 after
2201 "https://chrome-sync.sandbox.google.com/chrome-sync/alpha") 2205 "https://chrome-sync.sandbox.google.com/chrome-sync/alpha")
2202 }, 2206 },
2203 { 2207 {
2204 "enable-child-account-detection", 2208 "enable-child-account-detection",
2205 IDS_FLAGS_CHILD_ACCOUNT_DETECTION_NAME, 2209 IDS_FLAGS_CHILD_ACCOUNT_DETECTION_NAME,
2206 IDS_FLAGS_CHILD_ACCOUNT_DETECTION_DESCRIPTION, 2210 IDS_FLAGS_CHILD_ACCOUNT_DETECTION_DESCRIPTION,
2207 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, 2211 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
2208 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableChildAccountDetection, 2212 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableChildAccountDetection,
2209 switches::kDisableChildAccountDetection) 2213 switches::kDisableChildAccountDetection)
2210 }, 2214 },
2215 #if defined(OS_CHROMEOS) && defined(USE_OZONE)
2216 {
2217 "ozone-test-single-overlay-support",
2218 IDS_FLAGS_OZONE_TEST_SINGLE_HARDWARE_OVERLAY,
2219 IDS_FLAGS_OZONE_TEST_SINGLE_HARDWARE_OVERLAY_DESCRIPTION,
2220 kOsCrOS,
2221 SINGLE_VALUE_TYPE(switches::kOzoneTestSingleOverlaySupport)
2222 },
2223 #endif // defined(OS_CHROMEOS) && defined(USE_OZONE)
2211 2224
2212 // NOTE: Adding new command-line switches requires adding corresponding 2225 // NOTE: Adding new command-line switches requires adding corresponding
2213 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2226 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2214 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2227 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2215 }; 2228 };
2216 2229
2217 const Experiment* experiments = kExperiments; 2230 const Experiment* experiments = kExperiments;
2218 size_t num_experiments = arraysize(kExperiments); 2231 size_t num_experiments = arraysize(kExperiments);
2219 2232
2220 // Stores and encapsulates the little state that about:flags has. 2233 // Stores and encapsulates the little state that about:flags has.
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
2804 } 2817 }
2805 2818
2806 const Experiment* GetExperiments(size_t* count) { 2819 const Experiment* GetExperiments(size_t* count) {
2807 *count = num_experiments; 2820 *count = num_experiments;
2808 return experiments; 2821 return experiments;
2809 } 2822 }
2810 2823
2811 } // namespace testing 2824 } // namespace testing
2812 2825
2813 } // namespace about_flags 2826 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/browser/compositor/gpu_process_transport_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698