Print Preview: Add "print preview" back to about:flags; enable it by default just once.

chrome/common/chrome_switches.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/common/chrome_switches.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 
 namespace switches {
@@ skipping 1151 matching lines @@
 const char kExposePrivateExtensionApi[]   = "expose-private-extension-api";
 #endif
 
 #if defined(HAVE_XINPUT2)
 // Tells chrome to interpret events from these devices as touch events. Only
 // available with XInput 2 (i.e. X server 1.8 or above). The id's of the devices
 // can be retrieved from 'xinput list'.
 const char kTouchDevices[]                  = "touch-devices";
 #endif
 
-#if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX)
 // Disable print preview (Not exposed via about:flags. Only used for testing.)
 const char kDisablePrintPreview[]           = "disable-print-preview";
 
-bool IsPrintPreviewEnabled() {
-  return !CommandLine::ForCurrentProcess()->HasSwitch(kDisablePrintPreview);
-}
-#else
 // Enable print preview (no PDF viewer, thus not supported with Chromium).
+// kDisablePrintPreview overrides this.
 const char kEnablePrintPreview[]            = "enable-print-preview";
 
 bool IsPrintPreviewEnabled() {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(kDisablePrintPreview))
+    return false;
   return CommandLine::ForCurrentProcess()->HasSwitch(kEnablePrintPreview);
 }
-#endif
 
 bool IsInBrowserThumbnailingEnabled() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       kEnableInBrowserThumbnailing);
 }
 
 // -----------------------------------------------------------------------------
 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
 //
 // You were going to just dump your switches here, weren't you? Instead,
 // please put them in alphabetical order above, or in order inside the
 // appropriate ifdef at the bottom. The order should match the header.
 // -----------------------------------------------------------------------------
 
 }  // namespace switches