Enable hidpi on Linux, refactor a bit on Windows to share

ui/base/resource/resource_bundle.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 "ui/base/resource/resource_bundle.h"
 
 #include <limits>
 #include <vector>
 
 #include "base/big_endian.h"
@@ skipping 11 matching lines @@
 #include "build/build_config.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/data_pack.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/dpi.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_source.h"
 #include "ui/gfx/safe_integer_conversions.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/strings/grit/app_locale_settings.h"
 
 #if defined(OS_ANDROID)
 #include "ui/base/resource/resource_bundle_android.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/platform_font_pango.h"
 #endif
 
-#if defined(OS_WIN)
-#include "ui/base/win/dpi_setup.h"
-#include "ui/gfx/win/dpi.h"
-#endif
-
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 #include "base/mac/mac_util.h"
 #endif
 
 namespace ui {
 
 namespace {
 
 // Font sizes relative to base font.
 const int kSmallFontSizeDelta = -1;
@@ skipping 316 matching lines @@
   }
 
   gfx::Image image;
   if (delegate_)
     image = delegate_->GetImageNamed(resource_id);
 
   if (image.IsEmpty()) {
     DCHECK(!data_packs_.empty()) <<
         "Missing call to SetResourcesDataDLL?";
 
-#if defined(OS_CHROMEOS) || defined(OS_WIN)
+#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX)
   ui::ScaleFactor scale_factor_to_load = GetMaxScaleFactor();
 #else
   ui::ScaleFactor scale_factor_to_load = ui::SCALE_FACTOR_100P;
 #endif
 
     // TODO(oshima): Consider reading the image size from png IHDR chunk and
     // skip decoding here and remove #ifdef below.
     // ResourceBundle::GetSharedInstance() is destroyed after the
     // BrowserMainLoop has finished running. |image_skia| is guaranteed to be
     // destroyed before the resource bundle is destroyed.
@@ skipping 216 matching lines @@
     supported_scale_factors.push_back(SCALE_FACTOR_200P);
   } else {
     supported_scale_factors.push_back(SCALE_FACTOR_100P);
   }
 #elif defined(OS_MACOSX)
   if (base::mac::IsOSLionOrLater())
     supported_scale_factors.push_back(SCALE_FACTOR_200P);
 #elif defined(OS_CHROMEOS)
   // TODO(oshima): Include 200P only if the device support 200P
   supported_scale_factors.push_back(SCALE_FACTOR_200P);
-#elif defined(OS_LINUX) && defined(ENABLE_HIDPI)
+#elif defined(OS_LINUX)
   supported_scale_factors.push_back(SCALE_FACTOR_200P);
 #elif defined(OS_WIN)
   bool default_to_100P = true;
   if (gfx::IsHighDPIEnabled()) {
     // On Windows if the dpi scale is greater than 1.25 on high dpi machines
     // downscaling from 200 percent looks better than scaling up from 100
     // percent.
     if (gfx::GetDPIScale() > 1.25) {
       supported_scale_factors.push_back(SCALE_FACTOR_200P);
       default_to_100P = false;
     }
   }
   if (default_to_100P)
     supported_scale_factors.push_back(SCALE_FACTOR_100P);
 #endif
   ui::SetSupportedScaleFactors(supported_scale_factors);
-#if defined(OS_WIN)
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
   // Must be called _after_ supported scale factors are set since it
   // uses them.
   // Don't initialize the device scale factor if it has already been
   // initialized.
-  if (!gfx::win::IsDeviceScaleFactorSet())
-    ui::win::InitDeviceScaleFactor();
+  if (!gfx::IsDeviceScaleFactorSet())
+    gfx::InitDeviceScaleFactor(gfx::GetDPIScale());
 #endif
 }
 
 void ResourceBundle::FreeImages() {
   images_.clear();
 }
 
 void ResourceBundle::AddDataPackFromPathInternal(const base::FilePath& path,
                                                  ScaleFactor scale_factor,
                                                  bool optional) {
@@ skipping 196 matching lines @@
 // static
 bool ResourceBundle::DecodePNG(const unsigned char* buf,
                                size_t size,
                                SkBitmap* bitmap,
                                bool* fell_back_to_1x) {
   *fell_back_to_1x = PNGContainsFallbackMarker(buf, size);
   return gfx::PNGCodec::Decode(buf, size, bitmap);
 }
 
 }  // namespace ui