| Index: content/browser/android/ui_resource_provider_impl.cc
|
| diff --git a/content/browser/android/ui_resource_provider_impl.cc b/content/browser/android/ui_resource_provider_impl.cc
|
| index f97975cc81e06429697d3e2f03fdedace52f1042..d7aa98bb5c631c6250d8b9f8b3f893b9f3a81cc3 100644
|
| --- a/content/browser/android/ui_resource_provider_impl.cc
|
| +++ b/content/browser/android/ui_resource_provider_impl.cc
|
| @@ -6,11 +6,12 @@
|
|
|
| #include "cc/resources/ui_resource_client.h"
|
| #include "cc/trees/layer_tree_host.h"
|
| -#include "content/public/browser/android/ui_resource_client_android.h"
|
| +#include "ui/base/android/ui_resource_client_android.h"
|
|
|
| namespace content {
|
|
|
| -UIResourceProviderImpl::UIResourceProviderImpl() : host_(NULL) {
|
| +UIResourceProviderImpl::UIResourceProviderImpl()
|
| + : system_ui_resource_manager_(this), host_(NULL) {
|
| }
|
|
|
| UIResourceProviderImpl::~UIResourceProviderImpl() {
|
| @@ -35,7 +36,7 @@ void UIResourceProviderImpl::UIResourcesAreInvalid() {
|
| }
|
|
|
| cc::UIResourceId UIResourceProviderImpl::CreateUIResource(
|
| - UIResourceClientAndroid* client) {
|
| + ui::UIResourceClientAndroid* client) {
|
| if (!host_)
|
| return 0;
|
| cc::UIResourceId id = host_->CreateUIResource(client);
|
| @@ -57,4 +58,9 @@ void UIResourceProviderImpl::DeleteUIResource(cc::UIResourceId ui_resource_id) {
|
| host_->DeleteUIResource(ui_resource_id);
|
| }
|
|
|
| +ui::SystemUIResourceManager&
|
| +UIResourceProviderImpl::GetSystemUIResourceManager() {
|
| + return system_ui_resource_manager_;
|
| +}
|
| +
|
| } // namespace content
|
|
|