Added flags to expose GCP->print preview integration

chrome/browser/about_flags.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 142 matching lines @@
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kShowFPSCounter)
   },
   {
     "disable-gpu-vsync",
     IDS_FLAGS_DISABLE_GPU_VSYNC_NAME,
     IDS_FLAGS_DISABLE_GPU_VSYNC_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kDisableGpuVsync)
   },
+#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS)

[Scott Byer, 2011/08/22 23:35:50]

There's a subtlety here with about flags and sync services - if the flag isn't
always present, it gets stripped from the flags to be set, leading to possible
strange behavior for users of multiple machines.

See the flag enablement for cloud-print-proxy - essentially zeroing out the OS
flag under the right cases keeps the flag  setting across platforms but doesn't
expose it.

[Albert Bodenhamer, 2011/08/23 01:05:07]

Done.

   // Only expose this for Chromium builds where users may not have the PDF
   // plugin. Do not give Google Chrome users the option to disable it here.
+  // Also expose it for Chrome OS where print preview is still experimental.
   {
     "print-preview",  // FLAGS:RECORD_UMA
+    IDS_FLAGS_CLOUD_PRINT_NAME,

[Scott Byer, 2011/08/22 23:35:50]

Are the IDS usages backwards between the two flags?

[Albert Bodenhamer, 2011/08/23 01:05:07]

Yikes!  Good catch.  A different logic error was masking the effects of this in
my testing.

+    IDS_FLAGS_CLOUD_PRINT_DESCRIPTION,
+    kOsAll,
+    SINGLE_VALUE_TYPE(switches::kEnablePrintPreview)
+  },
+#endif
+#if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS)
+  // Define this for all CHROME builds (since print preview is on there)
+  // except for Chrome OS where cloud print is the only way to print and
+  // we shouldn't let users turn it off.
+  // If this flag is on and print preview is enabled, cloud print will be
+  // enabled in print preview
+  {
+    "cloud-print",  // FLAGS:RECORD_UMA
     IDS_FLAGS_PRINT_PREVIEW_NAME,
     IDS_FLAGS_PRINT_PREVIEW_DESCRIPTION,
     kOsAll,
-    SINGLE_VALUE_TYPE(switches::kEnablePrintPreview)
+    SINGLE_VALUE_TYPE(switches::kEnableCloudPrint)
   },
+#endif
   // TODO(dspringer): When NaCl is on by default, remove this flag entry.
   {
     "enable-nacl",  // FLAGS:RECORD_UMA
     IDS_FLAGS_ENABLE_NACL_NAME,
     IDS_FLAGS_ENABLE_NACL_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kEnableNaCl)
   },
   {
     "extension-apis",  // FLAGS:RECORD_UMA
@@ skipping 616 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags