Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2032)

Unified Diff: chrome/browser/android/compositor/tab_content_manager.cc

Issue 755643004: Replace SystemUIResourceManager with ResourceManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix clang build failure Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/compositor/tab_content_manager.cc
diff --git a/chrome/browser/android/compositor/tab_content_manager.cc b/chrome/browser/android/compositor/tab_content_manager.cc
index 1be9a04f2e32033e9cb172a874d22aca1f1641cd..b41f505758f8b80edbb9649fe24f206ea91b4a29 100644
--- a/chrome/browser/android/compositor/tab_content_manager.cc
+++ b/chrome/browser/android/compositor/tab_content_manager.cc
@@ -16,11 +16,11 @@
#include "chrome/browser/android/tab_android.h"
#include "chrome/browser/android/thumbnail/thumbnail.h"
#include "content/public/browser/android/content_view_core.h"
-#include "content/public/browser/android/ui_resource_provider.h"
#include "content/public/browser/readback_types.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
#include "jni/TabContentManager_jni.h"
+#include "ui/android/resources/ui_resource_provider.h"
#include "ui/gfx/android/java_bitmap.h"
#include "ui/gfx/rect.h"
#include "url/gurl.h"
@@ -156,13 +156,13 @@ void TabContentManager::Destroy(JNIEnv* env, jobject obj) {
void TabContentManager::SetUIResourceProvider(JNIEnv* env,
jobject obj,
jlong ui_resource_provider_ptr) {
- content::UIResourceProvider* ui_resource_provider =
- reinterpret_cast<content::UIResourceProvider*>(ui_resource_provider_ptr);
+ ui::UIResourceProvider* ui_resource_provider =
+ reinterpret_cast<ui::UIResourceProvider*>(ui_resource_provider_ptr);
SetUIResourceProvider(ui_resource_provider);
}
void TabContentManager::SetUIResourceProvider(
- content::UIResourceProvider* ui_resource_provider) {
+ ui::UIResourceProvider* ui_resource_provider) {
thumbnail_cache_->SetUIResourceProvider(ui_resource_provider);
}
« no previous file with comments | « chrome/browser/android/compositor/tab_content_manager.h ('k') | chrome/browser/android/thumbnail/thumbnail.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698