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

Unified Diff: ui/aura/root_window_host_linux.cc

Issue 10837142: Remove --load-2x-resources flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. Created 8 years, 4 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 | « content/browser/zygote_host/zygote_host_impl_linux.cc ('k') | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « content/browser/zygote_host/zygote_host_impl_linux.cc ('k') | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698