Chromium Code Reviews| Index: ui/android/resources/resource_manager_impl.h |
| diff --git a/ui/android/resources/resource_manager_impl.h b/ui/android/resources/resource_manager_impl.h |
| index 4e089898f3a67ec0bc73017ed03e7d4833d5c5fb..94310b1215b0ac1c78a52290c2d828c92c2ab10b 100644 |
| --- a/ui/android/resources/resource_manager_impl.h |
| +++ b/ui/android/resources/resource_manager_impl.h |
| @@ -26,6 +26,10 @@ class UI_ANDROID_EXPORT ResourceManagerImpl : public ResourceManager { |
| // ResourceManager implementation. |
| base::android::ScopedJavaLocalRef<jobject> GetJavaObject() override; |
| Resource* GetResource(AndroidResourceType res_type, int res_id) override; |
| + Resource* GetStaticResourceWithTint( |
| + int res_id, int tint_color, int default_color) override; |
| + void ClearTintedResourceCache(JNIEnv* env, |
|
David Trainor- moved to gerrit
2016/08/30 19:27:32
Move this out of the interface block of methods an
mdjones
2016/08/30 21:52:16
Done.
|
| + const base::android::JavaRef<jobject>& jobj); |
| void PreloadResource(AndroidResourceType res_type, int res_id) override; |
| CrushedSpriteResource* GetCrushedSpriteResource( |
| int bitmap_res_id, int metadata_res_id) override; |
| @@ -82,10 +86,12 @@ class UI_ANDROID_EXPORT ResourceManagerImpl : public ResourceManager { |
| typedef IDMap<Resource, IDMapOwnPointer> ResourceMap; |
| typedef IDMap<CrushedSpriteResource, IDMapOwnPointer> |
| CrushedSpriteResourceMap; |
| + typedef IDMap<ResourceMap, IDMapOwnPointer> TintedResourceMap; |
| cc::LayerTreeHost* host_; |
| ResourceMap resources_[ANDROID_RESOURCE_TYPE_COUNT]; |
| CrushedSpriteResourceMap crushed_sprite_resources_; |
| + TintedResourceMap tinted_resources_; |
| base::android::ScopedJavaGlobalRef<jobject> java_obj_; |