| Index: ui/android/resources/resource_manager.h
|
| diff --git a/ui/android/resources/resource_manager.h b/ui/android/resources/resource_manager.h
|
| index c80a543e213d0473ddf189d0ee9c3413efd795b1..a8852893364df73215c6f0688bdeabb7f4b70fc1 100644
|
| --- a/ui/android/resources/resource_manager.h
|
| +++ b/ui/android/resources/resource_manager.h
|
| @@ -12,7 +12,6 @@
|
| #include "base/android/jni_android.h"
|
| #include "cc/resources/scoped_ui_resource.h"
|
| #include "third_party/skia/include/core/SkColor.h"
|
| -#include "ui/android/resources/crushed_sprite_resource.h"
|
| #include "ui/android/resources/resource.h"
|
| #include "ui/android/ui_android_export.h"
|
|
|
| @@ -25,11 +24,10 @@ 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_CRUSHED_SPRITE,
|
| + ANDROID_RESOURCE_TYPE_LAST = ANDROID_RESOURCE_TYPE_SYSTEM,
|
| };
|
|
|
| // The ResourceManager serves as a cache for resources obtained through Android
|
| @@ -60,14 +58,6 @@ 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 CrushedSpriteResource* GetCrushedSpriteResource(
|
| - int bitmap_res_id, int metadata_res_id) = 0;
|
| -
|
| // Convenience wrapper method.
|
| cc::UIResourceId GetUIResourceId(AndroidResourceType res_type, int res_id) {
|
| Resource* resource = GetResource(res_type, res_id);
|
|
|