Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(641)

Unified Diff: trunk/src/ash/drag_drop/drag_drop_controller_unittest.cc

Issue 24262008: Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/ash/display/mirror_window_controller.cc ('k') | trunk/src/ash/drag_drop/drag_image_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/drag_drop/drag_drop_controller_unittest.cc
===================================================================
--- trunk/src/ash/drag_drop/drag_drop_controller_unittest.cc (revision 224497)
+++ trunk/src/ash/drag_drop/drag_drop_controller_unittest.cc (working copy)
@@ -77,7 +77,7 @@
virtual void WriteDragData(const gfx::Point& p,
OSExchangeData* data) OVERRIDE {
data->SetString(UTF8ToUTF16("I am being dragged"));
- gfx::ImageSkiaRep image_rep(gfx::Size(10, 20), 1.0f);
+ gfx::ImageSkiaRep image_rep(gfx::Size(10, 20), ui::SCALE_FACTOR_100P);
gfx::ImageSkia image_skia(image_rep);
drag_utils::SetDragImageOnDataObject(
« no previous file with comments | « trunk/src/ash/display/mirror_window_controller.cc ('k') | trunk/src/ash/drag_drop/drag_image_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698