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

Unified Diff: ui/android/resources/ui_resource_android.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
« no previous file with comments | « ui/android/resources/ui_resource_android.h ('k') | ui/android/resources/ui_resource_client_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/android/resources/ui_resource_android.cc
diff --git a/ui/android/resources/ui_resource_android.cc b/ui/android/resources/ui_resource_android.cc
index c2426300ef95c6db756ee03f3b8621995d17cbbb..bc85bb88666a50033e24bc5d439c364d9ce7d5ab 100644
--- a/ui/android/resources/ui_resource_android.cc
+++ b/ui/android/resources/ui_resource_android.cc
@@ -5,12 +5,12 @@
#include "ui/android/resources/ui_resource_android.h"
#include "base/logging.h"
-#include "content/public/browser/android/ui_resource_provider.h"
+#include "ui/android/resources/ui_resource_provider.h"
namespace ui {
scoped_ptr<UIResourceAndroid> UIResourceAndroid::CreateFromJavaBitmap(
- content::UIResourceProvider* provider,
+ ui::UIResourceProvider* provider,
const gfx::JavaBitmap& java_bitmap) {
SkBitmap skbitmap = gfx::CreateSkBitmapFromJavaBitmap(java_bitmap);
skbitmap.setImmutable();
@@ -42,7 +42,7 @@ void UIResourceAndroid::UIResourceIsInvalid() {
id_ = 0;
}
-UIResourceAndroid::UIResourceAndroid(content::UIResourceProvider* provider,
+UIResourceAndroid::UIResourceAndroid(ui::UIResourceProvider* provider,
const SkBitmap& skbitmap)
: provider_(provider), bitmap_(skbitmap), id_(0) {
}
« no previous file with comments | « ui/android/resources/ui_resource_android.h ('k') | ui/android/resources/ui_resource_client_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698