Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx"

trunk/src/apps/shell_window.cc

 // Copyright 2013 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 "apps/shell_window.h"
 
 #include "apps/native_app_window.h"
 #include "apps/shell_window_geometry_cache.h"
 #include "apps/shell_window_registry.h"
 #include "base/strings/string_util.h"
@@ skipping 439 matching lines @@
   app_icon_image_.reset(new extensions::IconImage(
       profile(),
       extension(),
       extensions::IconsInfo::GetIcons(extension()),
       delegate_->PreferredIconSize(),
       extensions::IconsInfo::GetDefaultAppIcon(),
       this));
 
   // Triggers actual image loading with 1x resources. The 2x resource will
   // be handled by IconImage class when requested.
-  app_icon_image_->image_skia().GetRepresentation(1.0f);
+  app_icon_image_->image_skia().GetRepresentation(ui::SCALE_FACTOR_100P);
 }
 
 void ShellWindow::CloseContents(WebContents* contents) {
   native_app_window_->Close();
 }
 
 bool ShellWindow::ShouldSuppressDialogs() {
   return true;
 }
 
@@ skipping 179 matching lines @@
         region.bounds.x(),
         region.bounds.y(),
         region.bounds.right(),
         region.bounds.bottom(),
         region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
   }
   return sk_region;
 }
 
 }  // namespace apps