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

Unified Diff: ui/android/resources/ui_resource_android.h

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/resource_manager_unittest.cc ('k') | ui/android/resources/ui_resource_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/android/resources/ui_resource_android.h
diff --git a/ui/android/resources/ui_resource_android.h b/ui/android/resources/ui_resource_android.h
index c18c0d73ee22075e07ec79dcd77a3b66a673a159..3f5e55cfe7b755ba811f5ccea777e71c3f50e8de 100644
--- a/ui/android/resources/ui_resource_android.h
+++ b/ui/android/resources/ui_resource_android.h
@@ -7,19 +7,20 @@
#include "base/basictypes.h"
#include "cc/resources/ui_resource_bitmap.h"
-#include "content/public/browser/android/ui_resource_client_android.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/android/resources/ui_resource_android.h"
+#include "ui/android/resources/ui_resource_client_android.h"
#include "ui/android/ui_android_export.h"
#include "ui/gfx/android/java_bitmap.h"
namespace ui {
-class UI_ANDROID_EXPORT UIResourceAndroid
- : public content::UIResourceClientAndroid {
+class UIResourceProvider;
+
+class UI_ANDROID_EXPORT UIResourceAndroid : public ui::UIResourceClientAndroid {
public:
static scoped_ptr<UIResourceAndroid> CreateFromJavaBitmap(
- content::UIResourceProvider* provider,
+ ui::UIResourceProvider* provider,
const gfx::JavaBitmap& java_bitmap);
~UIResourceAndroid() override;
@@ -28,16 +29,15 @@ class UI_ANDROID_EXPORT UIResourceAndroid
cc::UIResourceBitmap GetBitmap(cc::UIResourceId uid,
bool resource_lost) override;
- // UIResourceClientAndroid implementation.
+ // ui::UIResourceClientAndroid implementation.
void UIResourceIsInvalid() override;
cc::UIResourceId id();
private:
- UIResourceAndroid(content::UIResourceProvider* provider,
- const SkBitmap& skbitmap);
+ UIResourceAndroid(ui::UIResourceProvider* provider, const SkBitmap& skbitmap);
- content::UIResourceProvider* provider_;
+ ui::UIResourceProvider* provider_;
SkBitmap bitmap_;
cc::UIResourceId id_;
« no previous file with comments | « ui/android/resources/resource_manager_unittest.cc ('k') | ui/android/resources/ui_resource_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698