Index: content/browser/android/ui_resource_provider_impl.h |
diff --git a/content/browser/android/ui_resource_provider_impl.h b/content/browser/android/ui_resource_provider_impl.h |
index 79c23014d2d3735554d68a447ca7e44cc500617c..6084f2428c6367dff704bddea9857689529fe91b 100644 |
--- a/content/browser/android/ui_resource_provider_impl.h |
+++ b/content/browser/android/ui_resource_provider_impl.h |
@@ -6,17 +6,21 @@ |
#define CONTENT_BROWSER_ANDROID_UI_RESOURCE_PROVIDER_IMPL_H_ |
#include "base/containers/hash_tables.h" |
-#include "content/public/browser/android/ui_resource_provider.h" |
+#include "content/browser/android/system_ui_resource_manager_impl.h" |
+#include "ui/base/android/system_ui_resource_manager.h" |
+#include "ui/base/android/ui_resource_provider.h" |
namespace cc { |
class LayerTreeHost; |
} |
-namespace content { |
- |
+namespace ui { |
class UIResourceClientAndroid; |
+} |
-class UIResourceProviderImpl : public UIResourceProvider { |
+namespace content { |
+ |
+class UIResourceProviderImpl : public ui::UIResourceProvider { |
public: |
UIResourceProviderImpl(); |
@@ -27,15 +31,17 @@ class UIResourceProviderImpl : public UIResourceProvider { |
void UIResourcesAreInvalid(); |
virtual cc::UIResourceId CreateUIResource( |
- UIResourceClientAndroid* client) OVERRIDE; |
+ ui::UIResourceClientAndroid* client) OVERRIDE; |
virtual void DeleteUIResource(cc::UIResourceId resource_id) OVERRIDE; |
+ ui::SystemUIResourceManager& GetSystemUIResourceManager(); |
+ |
private: |
- typedef base::hash_map<cc::UIResourceId, UIResourceClientAndroid*> |
+ typedef base::hash_map<cc::UIResourceId, ui::UIResourceClientAndroid*> |
UIResourceClientMap; |
UIResourceClientMap ui_resource_client_map_; |
- |
+ SystemUIResourceManagerImpl system_ui_resource_manager_; |
cc::LayerTreeHost* host_; |
DISALLOW_COPY_AND_ASSIGN(UIResourceProviderImpl); |