Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx"

trunk/src/ui/base/resource/resource_bundle.h

Index: trunk/src/ui/base/resource/resource_bundle.h
===================================================================
--- trunk/src/ui/base/resource/resource_bundle.h	(revision 224498)
+++ trunk/src/ui/base/resource/resource_bundle.h	(working copy)
@@ -255,7 +255,9 @@
 
   // Returns the maximum scale factor currently loaded.
   // Returns SCALE_FACTOR_100P if no resource is loaded.
-  ScaleFactor GetMaxScaleFactor() const;
+  ScaleFactor max_scale_factor() const {
+    return max_scale_factor_;
+  }
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ResourceBundleTest, DelegateGetPathForLocalePack);
@@ -272,9 +274,6 @@
   explicit ResourceBundle(Delegate* delegate);
   ~ResourceBundle();
 
-  // Shared initialization.
-  static void InitSharedInstance(Delegate* delegate);
-
   // Free skia_images_.
   void FreeImages();