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

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: Resolved new conflictswq Created 9 years, 5 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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 SINGLE_VALUE_TYPE(switches::kDisableGpuVsync) 176 SINGLE_VALUE_TYPE(switches::kDisableGpuVsync)
177 }, 177 },
178 #if !defined(GOOGLE_CHROME_BUILD) || defined(OS_MACOSX) 178 #if !defined(GOOGLE_CHROME_BUILD) || defined(OS_MACOSX)
179 // Only expose this for Chromium builds where users may not have the PDF 179 // Only expose this for Chromium builds where users may not have the PDF
180 // plugin. Do not give Google Chrome users the option to disable it here, 180 // plugin. Do not give Google Chrome users the option to disable it here,
181 // except on Mac, where it is disabled. 181 // except on Mac, where it is disabled.
182 { 182 {
183 "print-preview", // FLAGS:RECORD_UMA 183 "print-preview", // FLAGS:RECORD_UMA
184 IDS_FLAGS_PRINT_PREVIEW_NAME, 184 IDS_FLAGS_PRINT_PREVIEW_NAME,
185 IDS_FLAGS_PRINT_PREVIEW_DESCRIPTION, 185 IDS_FLAGS_PRINT_PREVIEW_DESCRIPTION,
186 kOsMac | kOsWin | kOsLinux, // This switch is not available in CrOS. 186 kOsAll,
187 SINGLE_VALUE_TYPE(switches::kEnablePrintPreview) 187 SINGLE_VALUE_TYPE(switches::kEnablePrintPreview)
188 }, 188 },
189 #endif 189 #endif
190 // TODO(dspringer): When NaCl is on by default, remove this flag entry. 190 // TODO(dspringer): When NaCl is on by default, remove this flag entry.
191 { 191 {
192 switches::kEnableNaCl, // FLAGS:RECORD_UMA 192 switches::kEnableNaCl, // FLAGS:RECORD_UMA
193 IDS_FLAGS_ENABLE_NACL_NAME, 193 IDS_FLAGS_ENABLE_NACL_NAME,
194 IDS_FLAGS_ENABLE_NACL_DESCRIPTION, 194 IDS_FLAGS_ENABLE_NACL_DESCRIPTION,
195 kOsAll, 195 kOsAll,
196 SINGLE_VALUE_TYPE(switches::kEnableNaCl) 196 SINGLE_VALUE_TYPE(switches::kEnableNaCl)
(...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
810 } 810 }
811 811
812 const Experiment* GetExperiments(size_t* count) { 812 const Experiment* GetExperiments(size_t* count) {
813 *count = num_experiments; 813 *count = num_experiments;
814 return experiments; 814 return experiments;
815 } 815 }
816 816
817 } // namespace testing 817 } // namespace testing
818 818
819 } // namespace about_flags 819 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/print_preview/print_preview.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698