GetScaleFactorForNativeView should return scale factor in float

content/browser/web_contents/aura/overscroll_navigation_overlay.cc

 // Copyright 2014 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/aura/overscroll_navigation_overlay.h"
 
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/aura/image_window_delegate.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "ui/aura/window.h"
+#include "ui/base/layout.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_png_rep.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace content {
 
 // A LayerDelegate that paints an image for the layer.
@@ skipping 164 matching lines @@
 
 ui::Layer* OverscrollNavigationOverlay::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::GetImageScale(
-            ui::GetScaleFactorForNativeView(window_.get()))));
+        ui::GetScaleFactorForNativeView(window_.get())));
     image = gfx::Image(image_reps);
   }
   if (!layer_delegate_)
     layer_delegate_.reset(new ImageLayerDelegate());
   layer_delegate_->SetImage(image);
 
   ui::Layer* layer = new ui::Layer(ui::LAYER_TEXTURED);
   layer->set_delegate(layer_delegate_.get());
   return layer;
 }
@@ skipping 131 matching lines @@
 bool OverscrollNavigationOverlay::OnMessageReceived(
     const IPC::Message& message) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   IPC_BEGIN_MESSAGE_MAP(OverscrollNavigationOverlay, message)
     IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateRect, OnUpdateRect)
   IPC_END_MESSAGE_MAP()
   return false;
 }
 
 }  // namespace content