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

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

Issue 6624021: Turn on flag for Linux, too. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 IDS_FLAGS_CONFLICTS_CHECK_NAME, 123 IDS_FLAGS_CONFLICTS_CHECK_NAME,
124 IDS_FLAGS_CONFLICTS_CHECK_DESCRIPTION, 124 IDS_FLAGS_CONFLICTS_CHECK_DESCRIPTION,
125 kOsWin, 125 kOsWin,
126 SINGLE_VALUE_TYPE(switches::kConflictingModulesCheck) 126 SINGLE_VALUE_TYPE(switches::kConflictingModulesCheck)
127 }, 127 },
128 { 128 {
129 "cloud-print-proxy", // FLAGS:RECORD_UMA 129 "cloud-print-proxy", // FLAGS:RECORD_UMA
130 IDS_FLAGS_CLOUD_PRINT_PROXY_NAME, 130 IDS_FLAGS_CLOUD_PRINT_PROXY_NAME,
131 IDS_FLAGS_CLOUD_PRINT_PROXY_DESCRIPTION, 131 IDS_FLAGS_CLOUD_PRINT_PROXY_DESCRIPTION,
132 #if defined(GOOGLE_CHROME_BUILD) 132 #if defined(GOOGLE_CHROME_BUILD)
133 // For a Chrome build, we know we have a PDF plug-in, and so we'll 133 // For a Chrome build, we know we have a PDF plug-in on Windows, so it's
134 // enable by platform as we get things working. 134 // fully enabled. Mac and Linux still need some final polish.
135 kOsMac, 135 kOsMac | kOsLinux,
136 #else 136 #else
137 // Otherwise, where we know it could be working if a viable PDF 137 // Otherwise, where we know it could be working if a viable PDF
138 // plug-in could be supplied, we'll keep the lab enabled. 138 // plug-in could be supplied, we'll keep the lab enabled.
139 kOsWin | kOsMac, 139 kOsWin | kOsMac | kOsLinux,
140 #endif 140 #endif
141 SINGLE_VALUE_TYPE(switches::kEnableCloudPrintProxy) 141 SINGLE_VALUE_TYPE(switches::kEnableCloudPrintProxy)
142 }, 142 },
143 { 143 {
144 "crxless-web-apps", 144 "crxless-web-apps",
145 IDS_FLAGS_CRXLESS_WEB_APPS_NAME, 145 IDS_FLAGS_CRXLESS_WEB_APPS_NAME,
146 IDS_FLAGS_CRXLESS_WEB_APPS_DESCRIPTION, 146 IDS_FLAGS_CRXLESS_WEB_APPS_DESCRIPTION,
147 kOsAll, 147 kOsAll,
148 SINGLE_VALUE_TYPE(switches::kEnableCrxlessWebApps) 148 SINGLE_VALUE_TYPE(switches::kEnableCrxlessWebApps)
149 }, 149 },
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
685 } 685 }
686 686
687 const Experiment* GetExperiments(size_t* count) { 687 const Experiment* GetExperiments(size_t* count) {
688 *count = num_experiments; 688 *count = num_experiments;
689 return experiments; 689 return experiments;
690 } 690 }
691 691
692 } // namespace testing 692 } // namespace testing
693 693
694 } // namespace about_flags 694 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698