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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/resource/resource_bundle.cc

Issue 2356913002: Pass device scale factor from display to ws. (Closed)
Patch Set: Created 4 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
« services/ui/ws/viewport_metrics.h ('K') | « services/ui/ws/viewport_metrics.h ('k') | ui/display/fake_display_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle.cc
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index 899a8a45cb95aaf05737504cde5e9780fdf25afd..257a5877a0a550442b2803ee91d7186889f6230f 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -137,9 +137,10 @@ class ResourceBundle::ResourceBundleImageSource : public gfx::ImageSkiaSource {
// TODO(oshima): Android unit_tests runs at DSF=3 with 100P assets.
return gfx::ImageSkiaRep();
#else
- NOTREACHED() << "Unable to load image with id " << resource_id_
- << ", scale=" << scale;
- return gfx::ImageSkiaRep(CreateEmptyBitmap(), scale);
+// TODO: Remove before submitting.
rjkroege 2016/09/21 13:23:47 please complete TODO
kylechar 2016/09/22 20:03:27 Done.
+// NOTREACHED() << "Unable to load image with id " << resource_id_
+// << ", scale=" << scale;
+// return gfx::ImageSkiaRep(CreateEmptyBitmap(), scale);
#endif
}
« services/ui/ws/viewport_metrics.h ('K') | « services/ui/ws/viewport_metrics.h ('k') | ui/display/fake_display_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698