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

trunk/src/ui/views/drag_utils.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/views/drag_utils.h"
 
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/size.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 #elif defined(OS_WIN)
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/drag_source_win.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
 #else
 #error
 #endif
 
-float GetDeviceScaleForNativeView(views::Widget* widget) {
-  float device_scale = 1.0f;
+ui::ScaleFactor GetDeviceScaleFactorForNativeView(views::Widget* widget) {
+  ui::ScaleFactor device_scale_factor = ui::SCALE_FACTOR_100P;
 #if defined(USE_AURA)
   // The following code should work on other platforms as well. But we do not
   // yet care about device scale factor on other platforms. So to keep drag and
   // drop behavior on other platforms un-touched, we wrap this in the #if guard.
   if (widget && widget->GetNativeView()) {
     gfx::NativeView view = widget->GetNativeView();
     gfx::Display display = gfx::Screen::GetScreenFor(view)->
         GetDisplayNearestWindow(view);
-    device_scale = display.device_scale_factor();
+    device_scale_factor = ui::GetScaleFactorFromScale(
+        display.device_scale_factor());
   }
 #endif
-  return device_scale;
+  return device_scale_factor;
 }
 
 namespace views {
 
 void RunShellDrag(gfx::NativeView view,
                   const ui::OSExchangeData& data,
                   const gfx::Point& location,
                   int operation,
                   ui::DragDropTypes::DragEventSource source) {
 #if defined(USE_AURA)
   gfx::Point root_location(location);
   aura::RootWindow* root_window = view->GetRootWindow();
   aura::Window::ConvertPointToTarget(view, root_window, &root_location);
   if (aura::client::GetDragDropClient(root_window)) {
     aura::client::GetDragDropClient(root_window)->StartDragAndDrop(
         data, root_window, view, root_location, operation, source);
   }
 #elif defined(OS_WIN)
   scoped_refptr<ui::DragSourceWin> drag_source(new ui::DragSourceWin);
   DWORD effects;
   DoDragDrop(ui::OSExchangeDataProviderWin::GetIDataObject(data),
              drag_source,
              ui::DragDropTypes::DragOperationToDropEffect(operation),
              &effects);
 #endif
 }
 
 gfx::Canvas* GetCanvasForDragImage(views::Widget* widget,
                                    const gfx::Size& canvas_size) {
-  float device_scale = GetDeviceScaleForNativeView(widget);
-  return new gfx::Canvas(canvas_size, device_scale, false);
+  ui::ScaleFactor device_scale_factor =
+      GetDeviceScaleFactorForNativeView(widget);
+  return new gfx::Canvas(canvas_size, device_scale_factor, false);
 }
 
 }  // namespace views