Remove screen dependency from font_render_params_linux

ui/gfx/platform_font_linux.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/gfx/platform_font_linux.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/lazy_instance.h"
@@ skipping 178 matching lines @@
   SkString family_name;
   typeface_->getFamilyName(&family_name);
   return family_name.c_str();
 }
 
 int PlatformFontLinux::GetFontSize() const {
   return font_size_pixels_;
 }
 
 const FontRenderParams& PlatformFontLinux::GetFontRenderParams() {
-#if defined(OS_CHROMEOS)
   float current_scale_factor = GetFontRenderParamsDeviceScaleFactor();
   if (current_scale_factor != device_scale_factor_) {
     FontRenderParamsQuery query;
     query.families.push_back(font_family_);
     query.pixel_size = font_size_pixels_;
     query.style = style_;
     query.device_scale_factor = current_scale_factor;
     font_render_params_ = gfx::GetFontRenderParams(query, nullptr);
     device_scale_factor_ = current_scale_factor;
   }
-#endif
   return font_render_params_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformFontLinux, private:
 
 PlatformFontLinux::PlatformFontLinux(const skia::RefPtr<SkTypeface>& typeface,
                                      const std::string& family,
                                      int size_pixels,
                                      int style,
                                      const FontRenderParams& render_params) {
   InitFromDetails(typeface, family, size_pixels, style, render_params);
 }
 
 PlatformFontLinux::~PlatformFontLinux() {}
 
 void PlatformFontLinux::InitFromDetails(
     const skia::RefPtr<SkTypeface>& typeface,
     const std::string& font_family,
     int font_size_pixels,
     int style,
     const FontRenderParams& render_params) {
   DCHECK_GT(font_size_pixels, 0);
 
   font_family_ = font_family;
   typeface_ = typeface ? typeface : CreateSkTypeface(style, &font_family_);
 
   font_size_pixels_ = font_size_pixels;
   style_ = style;
-#if defined(OS_CHROMEOS)
   device_scale_factor_ = GetFontRenderParamsDeviceScaleFactor();
-#endif
   font_render_params_ = render_params;
 
 }
 
 void PlatformFontLinux::InitFromPlatformFont(const PlatformFontLinux* other) {
   typeface_ = other->typeface_;
   font_family_ = other->font_family_;
   font_size_pixels_ = other->font_size_pixels_;
   style_ = other->style_;
-#if defined(OS_CHROMEOS)
   device_scale_factor_ = other->device_scale_factor_;
-#endif
   font_render_params_ = other->font_render_params_;
 
   if (!other->metrics_need_computation_) {
     metrics_need_computation_ = false;
     ascent_pixels_ = other->ascent_pixels_;
     height_pixels_ = other->height_pixels_;
     cap_height_pixels_ = other->cap_height_pixels_;
     average_width_pixels_ = other->average_width_pixels_;
   }
 }
@@ skipping 27 matching lines @@
   return new PlatformFontLinux;
 }
 
 // static
 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string& font_name,
                                                   int font_size) {
   return new PlatformFontLinux(font_name, font_size);
 }
 
 }  // namespace gfx