Index: ui/aura/root_window_host_linux.cc |
diff --git a/ui/aura/root_window_host_linux.cc b/ui/aura/root_window_host_linux.cc |
index 0325b7c728ae400bc6b56267ed635533384c394c..b7ae4d16f067147040678bdd3491c1bc94633659 100644 |
--- a/ui/aura/root_window_host_linux.cc |
+++ b/ui/aura/root_window_host_linux.cc |
@@ -302,11 +302,6 @@ bool ShouldSendCharEventForKeyboardCode(ui::KeyboardCode keycode) { |
} |
} |
-bool HasLoaded2xResources() { |
- return gfx::Display::GetForcedDeviceScaleFactor() > 1.0f || |
- CommandLine::ForCurrentProcess()->HasSwitch(switches::kLoad2xResources); |
-} |
- |
} // namespace |
// A utility class that provides X Cursor for NativeCursors for which we have |
@@ -409,7 +404,6 @@ class RootWindowHostLinux::ImageCursors { |
ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id); |
const gfx::ImageSkiaRep& image_rep = image->GetRepresentation( |
ui::GetScaleFactorFromScale(scale_factor_)); |
- DCHECK(!HasLoaded2xResources() || scale_factor_ == image_rep.GetScale()); |
gfx::Point hot(hot_x * scale_factor_, hot_y * scale_factor_); |
XcursorImage* x_image = |
ui::SkBitmapToXcursorImage(&image_rep.sk_bitmap(), hot); |
@@ -425,7 +419,6 @@ class RootWindowHostLinux::ImageCursors { |
ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id); |
const gfx::ImageSkiaRep& image_rep = image->GetRepresentation( |
ui::GetScaleFactorFromScale(scale_factor_)); |
- DCHECK(!HasLoaded2xResources() || scale_factor_ == image_rep.GetScale()); |
const SkBitmap bitmap = image_rep.sk_bitmap(); |
DCHECK_EQ(bitmap.config(), SkBitmap::kARGB_8888_Config); |
int frame_width = bitmap.height(); |