| 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) {
|
| }
|
|
|