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

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

Issue 7038028: Initial support for cloudprint in print preview (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix bad merge Created 9 years, 7 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
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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 kOsWin | kOsLinux | kOsCrOS, 167 kOsWin | kOsLinux | kOsCrOS,
168 SINGLE_VALUE_TYPE(switches::kEnableAccelerated2dCanvas) 168 SINGLE_VALUE_TYPE(switches::kEnableAccelerated2dCanvas)
169 }, 169 },
170 #if !defined(GOOGLE_CHROME_BUILD) 170 #if !defined(GOOGLE_CHROME_BUILD)
171 // Only expose this for Chromium builds where users may not have the PDF 171 // Only expose this for Chromium builds where users may not have the PDF
172 // plugin. Do not give Google Chrome users the option to disable it here. 172 // plugin. Do not give Google Chrome users the option to disable it here.
173 { 173 {
174 "print-preview", // FLAGS:RECORD_UMA 174 "print-preview", // FLAGS:RECORD_UMA
175 IDS_FLAGS_PRINT_PREVIEW_NAME, 175 IDS_FLAGS_PRINT_PREVIEW_NAME,
176 IDS_FLAGS_PRINT_PREVIEW_DESCRIPTION, 176 IDS_FLAGS_PRINT_PREVIEW_DESCRIPTION,
177 kOsMac | kOsWin | kOsLinux, // This switch is not available in CrOS. 177 kOsMac | kOsWin | kOsLinux | kOsCrOS,
sanjeevr 2011/05/24 23:21:25 You can probably use kOsAll :)
Albert Bodenhamer 2011/06/09 17:33:11 Done.
178 SINGLE_VALUE_TYPE(switches::kEnablePrintPreview) 178 SINGLE_VALUE_TYPE(switches::kEnablePrintPreview)
179 }, 179 },
180 #endif 180 #endif
181 // TODO(dspringer): When NaCl is on by default, remove this flag entry. 181 // TODO(dspringer): When NaCl is on by default, remove this flag entry.
182 { 182 {
183 switches::kEnableNaCl, // FLAGS:RECORD_UMA 183 switches::kEnableNaCl, // FLAGS:RECORD_UMA
184 IDS_FLAGS_ENABLE_NACL_NAME, 184 IDS_FLAGS_ENABLE_NACL_NAME,
185 IDS_FLAGS_ENABLE_NACL_DESCRIPTION, 185 IDS_FLAGS_ENABLE_NACL_DESCRIPTION,
186 kOsAll, 186 kOsAll,
187 SINGLE_VALUE_TYPE(switches::kEnableNaCl) 187 SINGLE_VALUE_TYPE(switches::kEnableNaCl)
(...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 } 760 }
761 761
762 const Experiment* GetExperiments(size_t* count) { 762 const Experiment* GetExperiments(size_t* count) {
763 *count = num_experiments; 763 *count = num_experiments;
764 return experiments; 764 return experiments;
765 } 765 }
766 766
767 } // namespace testing 767 } // namespace testing
768 768
769 } // namespace about_flags 769 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698