[Contextual Search] Add support for crushed sprites and animate the search provider icon

ui/android/resources/resource_manager.h

Index: ui/android/resources/resource_manager.h
diff --git a/ui/android/resources/resource_manager.h b/ui/android/resources/resource_manager.h
index add8cda452f48082e0807ae8049463866335f28e..22c571e2ea029323078352f8334dd091ec0bc1a9 100644
--- a/ui/android/resources/resource_manager.h
+++ b/ui/android/resources/resource_manager.h
@@ -6,8 +6,10 @@
 #define UI_ANDROID_RESOURCES_RESOURCE_MANAGER_H_
 
 #include "base/android/jni_android.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/resources/scoped_ui_resource.h"
+#include "ui/android/resources/crushed_sprite_resource.h"
 #include "ui/android/ui_android_export.h"
 #include "ui/gfx/geometry/insets_f.h"
 #include "ui/gfx/geometry/rect.h"
@@ -24,10 +26,11 @@ enum AndroidResourceType {
   ANDROID_RESOURCE_TYPE_DYNAMIC,
   ANDROID_RESOURCE_TYPE_DYNAMIC_BITMAP,
   ANDROID_RESOURCE_TYPE_SYSTEM,
+  ANDROID_RESOURCE_TYPE_CRUSHED_SPRITE,
 
   ANDROID_RESOURCE_TYPE_COUNT,
   ANDROID_RESOURCE_TYPE_FIRST = ANDROID_RESOURCE_TYPE_STATIC,
-  ANDROID_RESOURCE_TYPE_LAST = ANDROID_RESOURCE_TYPE_SYSTEM,
+  ANDROID_RESOURCE_TYPE_LAST = ANDROID_RESOURCE_TYPE_CRUSHED_SPRITE,
 };
 
 // The ResourceManager serves as a cache for resources obtained through Android
@@ -61,6 +64,19 @@ class UI_ANDROID_EXPORT ResourceManager {
   // |res_id|, if it has not yet been loaded.
   virtual void PreloadResource(AndroidResourceType res_type, int res_id) = 0;
 
+  // Return a handle to the CrushedSpriteResource specified by |bitmap_res_id|
+  // and |metadata_res_id|. If the resource has not been loaded, loading will be
+  // performed synchronously, blocking until the load completes. If load fails,
+  // a null handle will be returned and it is up to the caller to react
+  // appropriately.
+  virtual scoped_refptr<CrushedSpriteResource> GetCrushedSpriteResource(
+      int bitmap_res_id, int metadata_res_id) = 0;
+
+  // Reload the source bitmap for the CrushedSpriteResource specified by
+  // |bitmap_res_id| if the resource has been loaded already. If the resource
+  // hasn't been loaded already, this method does nothing.
+  virtual void ReloadCrushedSpriteResource(int bitmap_res_id) = 0;
+
   // Convenience wrapper method.
   cc::UIResourceId GetUIResourceId(AndroidResourceType res_type, int res_id) {
     Resource* resource = GetResource(res_type, res_id);