OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <algorithm> | 7 #include <algorithm> |
8 #include <iterator> | 8 #include <iterator> |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 "conflicting-modules-check", // FLAGS:RECORD_UMA | 107 "conflicting-modules-check", // FLAGS:RECORD_UMA |
108 IDS_FLAGS_CONFLICTS_CHECK_NAME, | 108 IDS_FLAGS_CONFLICTS_CHECK_NAME, |
109 IDS_FLAGS_CONFLICTS_CHECK_DESCRIPTION, | 109 IDS_FLAGS_CONFLICTS_CHECK_DESCRIPTION, |
110 kOsWin, | 110 kOsWin, |
111 SINGLE_VALUE_TYPE(switches::kConflictingModulesCheck) | 111 SINGLE_VALUE_TYPE(switches::kConflictingModulesCheck) |
112 }, | 112 }, |
113 { | 113 { |
114 "cloud-print-proxy", // FLAGS:RECORD_UMA | 114 "cloud-print-proxy", // FLAGS:RECORD_UMA |
115 IDS_FLAGS_CLOUD_PRINT_PROXY_NAME, | 115 IDS_FLAGS_CLOUD_PRINT_PROXY_NAME, |
116 IDS_FLAGS_CLOUD_PRINT_PROXY_DESCRIPTION, | 116 IDS_FLAGS_CLOUD_PRINT_PROXY_DESCRIPTION, |
117 #if defined(GOOGLE_CHROME_BUILD) | 117 #if !defined(GOOGLE_CHROME_BUILD) |
118 // For a Chrome build, we know we have a PDF plug-in on Windows, so it's | 118 // For a Chrome build, we know we have a PDF plug-in on Windows, so it's |
119 // fully enabled. Linux still need some final polish. | 119 // fully enabled. |
120 kOsLinux, | |
121 #else | |
122 // Otherwise, where we know Windows could be working if a viable PDF | 120 // Otherwise, where we know Windows could be working if a viable PDF |
123 // plug-in could be supplied, we'll keep the lab enabled. Mac always has | 121 // plug-in could be supplied, we'll keep the lab enabled. Mac and Linux |
124 // PDF rasterization available, so no flag needed there. | 122 // always have PDF rasterization available, so no flag needed there. |
125 kOsWin | kOsLinux, | 123 kOsWin, |
126 #endif | 124 #endif |
127 SINGLE_VALUE_TYPE(switches::kEnableCloudPrintProxy) | 125 SINGLE_VALUE_TYPE(switches::kEnableCloudPrintProxy) |
128 }, | 126 }, |
129 { | 127 { |
130 "crxless-web-apps", | 128 "crxless-web-apps", |
131 IDS_FLAGS_CRXLESS_WEB_APPS_NAME, | 129 IDS_FLAGS_CRXLESS_WEB_APPS_NAME, |
132 IDS_FLAGS_CRXLESS_WEB_APPS_DESCRIPTION, | 130 IDS_FLAGS_CRXLESS_WEB_APPS_DESCRIPTION, |
133 kOsAll, | 131 kOsAll, |
134 SINGLE_VALUE_TYPE(switches::kEnableCrxlessWebApps) | 132 SINGLE_VALUE_TYPE(switches::kEnableCrxlessWebApps) |
135 }, | 133 }, |
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
806 } | 804 } |
807 | 805 |
808 const Experiment* GetExperiments(size_t* count) { | 806 const Experiment* GetExperiments(size_t* count) { |
809 *count = num_experiments; | 807 *count = num_experiments; |
810 return experiments; | 808 return experiments; |
811 } | 809 } |
812 | 810 |
813 } // namespace testing | 811 } // namespace testing |
814 | 812 |
815 } // namespace about_flags | 813 } // namespace about_flags |
OLD | NEW |