Remove Print As Image for Mac and Win

chrome/browser/about_flags.cc

 // Copyright (c) 2012 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 <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 2088 matching lines @@
 #endif
 #if !defined(OS_MACOSX)
     {"permission-prompt-persistence-toggle",
      IDS_FLAGS_PERMISSION_PROMPT_PERSISTENCE_TOGGLE_NAME,
      IDS_FLAGS_PERMISSION_PROMPT_PERSISTENCE_TOGGLE_DESCRIPTION,
      kOsWin | kOsCrOS | kOsLinux | kOsAndroid,
      FEATURE_VALUE_TYPE(
          features::kDisplayPersistenceToggleInPermissionPrompts)},
 #endif
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX)

[dpapad, 2017/01/05 21:43:03]

Is this equivalent to !OS_MACOSX && !OS_WIN?

Asking because there are more OS values, see
https://cs.chromium.org/chromium/src/PRESUBMIT.py?q=OS_WIN&sq=package:chromiu...,
and with this change it seems that we are removing this feature from more than
just Mac and Win.

[rbpotter, 2017/01/06 01:26:47]

Not sure if any other platforms besides Mac/Win/Linux/CrOS have print preview
enabled, but in case they do I have changed everything to !Mac and !Win to
ensure it is only removed from those platforms.

     {"print-pdf-as-image", IDS_FLAGS_PRINT_PDF_AS_IMAGE_NAME,
      IDS_FLAGS_PRINT_PDF_AS_IMAGE_DESCRIPTION, kOsDesktop,
      FEATURE_VALUE_TYPE(features::kPrintPdfAsImage)},
+#endif
     {"print-scaling", IDS_FLAGS_PRINT_SCALING_NAME,
      IDS_FLAGS_PRINT_SCALING_DESCRIPTION, kOsDesktop,
      FEATURE_VALUE_TYPE(features::kPrintScaling)},
 #endif  // !defined(OS_ANDROID)
 #if defined(OS_ANDROID)
     {"enable-consistent-omnibox-geolocation",
      IDS_FLAGS_ENABLE_CONSISTENT_OMNIBOX_GEOLOCATION_NAME,
      IDS_FLAGS_ENABLE_CONSISTENT_OMNIBOX_GEOLOCATION_DESCRIPTION, kOsAndroid,
      FEATURE_VALUE_TYPE(features::kConsistentOmniboxGeolocation)},
     {"concurrent-background-loading-on-svelte",
@@ skipping 254 matching lines @@
 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   *count = arraysize(kFeatureEntries);
   return kFeatureEntries;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags