Resize images for hi-dpi based on a custom PNG chunk added by GRIT r78, and roll GRIT r78

ui/base/resource/resource_bundle.h

Index: ui/base/resource/resource_bundle.h
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h
index 66e5790a1c55d3afb29d08bafbd7bdc8ab88fe02..d13b8ccefb949da0bc938416690f5e81b10d7769 100644
--- a/ui/base/resource/resource_bundle.h
+++ b/ui/base/resource/resource_bundle.h
@@ -285,14 +285,22 @@ class UI_EXPORT ResourceBundle {
   // Initialize all the gfx::Font members if they haven't yet been initialized.
   void LoadFontsIfNecessary();
 
-  // Creates and returns a new SkBitmap given the data file to look in and the
-  // |resource_id|.  It's up to the caller to free the returned bitmap when
-  // done.
-  SkBitmap* LoadBitmap(const ResourceHandle& dll_inst, int resource_id) const;
-
-  // Creates and returns a new SkBitmap for |resource_id| and |scale_factor|.
-  // Returns NULL if the resource does not exist.
-  SkBitmap* LoadBitmap(int resource_id, ScaleFactor scale_factor) const;
+  // Fills the |bitmap| given the data file to look in and the |resource_id|.
+  // Returns false if the resource does not exist.
+  //
+  // If the call succeeds, |fell_back_to_1x| indicates whether Chrome's custom
+  // csCl PNG chunk is present (added by GRIT if it falls back to a 100% image).
+  bool LoadBitmap(const ResourceHandle& data_handle,
+                  int resource_id,
+                  SkBitmap* bitmap,
+                  bool* fell_back_to_1x) const;
+
+  // Fills the |bitmap| given the |resource_id| and |scale_factor|.
+  // Returns false if the resource does not exist.
+  bool LoadBitmap(int resource_id,
+                  ScaleFactor scale_factor,
+                  SkBitmap* bitmap,
+                  bool* fell_back_to_1x) const;
 
   // Returns an empty image for when a resource cannot be loaded. This is a
   // bright red bitmap.