Remove dependency on ui::ScaleFactor from ui/gfx

content/browser/web_contents/web_contents_view_aura.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 "content/browser/web_contents/web_contents_view_aura.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 105 matching lines @@
           controller.GetEntryAtOffset(1));
     } else if (ShouldNavigateBack(controller, overscroll_mode)) {
       entry = NavigationEntryImpl::FromNavigationEntry(
           controller.GetEntryAtOffset(-1));
     }
 
     gfx::Image image;
     if (entry && entry->screenshot().get()) {
       std::vector<gfx::ImagePNGRep> image_reps;
       image_reps.push_back(gfx::ImagePNGRep(entry->screenshot(),
-            ui::GetScaleFactorForNativeView(web_contents_window())));
+          ui::GetImageScale(
+              ui::GetScaleFactorForNativeView(web_contents_window()))));
       image = gfx::Image(image_reps);
     }
     SetImage(image);
   }
 
   void stop_forwarding_events() { forward_events_ = false; }
 
  private:
   virtual ~OverscrollWindowDelegate() {}
 
@@ skipping 371 matching lines @@
   // NavigationEntry for the screenshot image to display.
   ui::Layer* CreateSlideLayer(int offset) {
     const NavigationControllerImpl& controller = web_contents_->GetController();
     const NavigationEntryImpl* entry = NavigationEntryImpl::FromNavigationEntry(
         controller.GetEntryAtOffset(offset));
 
     gfx::Image image;
     if (entry && entry->screenshot().get()) {
       std::vector<gfx::ImagePNGRep> image_reps;
       image_reps.push_back(gfx::ImagePNGRep(entry->screenshot(),
-            ui::GetScaleFactorForNativeView(window_.get())));
+          ui::GetImageScale(
+              ui::GetScaleFactorForNativeView(window_.get()))));
       image = gfx::Image(image_reps);
     }
     layer_delegate_.SetImage(image);
 
     ui::Layer* layer = new ui::Layer(ui::LAYER_TEXTURED);
     layer->set_delegate(&layer_delegate_);
     return layer;
   }
 
   // Overridden from WindowSlider::Delegate:
@@ skipping 1101 matching lines @@
       event.location(),
       gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(),
       ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
   if (drag_dest_delegate_)
     drag_dest_delegate_->OnDrop();
   current_drop_data_.reset();
   return current_drag_op_;
 }
 
 }  // namespace content