Revert 137622 - Fix a couple of bugs with the image skia implementation

ui/base/resource/resource_bundle.cc

Index: ui/base/resource/resource_bundle.cc
===================================================================
--- ui/base/resource/resource_bundle.cc	(revision 137624)
+++ ui/base/resource/resource_bundle.cc	(working copy)
@@ -25,7 +25,6 @@
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/screen.h"
 
 namespace ui {
 
@@ -237,11 +236,11 @@
     for (size_t i = 0; i < data_packs_.size(); ++i) {
       scoped_ptr<SkBitmap> bitmap(LoadBitmap(*data_packs_[i], resource_id));
       if (bitmap.get()) {
-        if (gfx::Screen::IsDIPEnabled())
-          image_skia.AddBitmapForScale(*bitmap,
-                                       data_packs_[i]->GetScaleFactor());
-        else
-          image_skia.AddBitmapForScale(*bitmap, 1.0f);
+#if defined(ENABLE_DIP)
+        image_skia.AddBitmapForScale(*bitmap, data_packs_[i]->GetScaleFactor());
+#else
+        image_skia.AddBitmapForScale(*bitmap, 1.0f);
+#endif
       }
     }