(Not ready for review!) Toolbar and views high dpi support.

ui/base/resource/resource_bundle.cc

Index: ui/base/resource/resource_bundle.cc
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index 2325507f4d977fad170fd83fb3ba70b6c6230373..9352444423f842d94e6bade9c01960f0453b6ec4 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -332,7 +332,7 @@ gfx::Image& ResourceBundle::GetImageNamed(int resource_id) {
     // ResourceBundle::GetSharedInstance() is destroyed after the
     // BrowserMainLoop has finished running. |image_skia| is guaranteed to be
     // destroyed before the resource bundle is destroyed.
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || defined(ENABLE_HIDPI)
     ui::ScaleFactor scale_factor_to_load = ui::GetMaxScaleFactor();
 #else
     ui::ScaleFactor scale_factor_to_load = ui::SCALE_FACTOR_100P;