| Index: trunk/src/ui/gfx/android/java_bitmap.cc
|
| ===================================================================
|
| --- trunk/src/ui/gfx/android/java_bitmap.cc (revision 225858)
|
| +++ trunk/src/ui/gfx/android/java_bitmap.cc (working copy)
|
| @@ -39,11 +39,11 @@
|
|
|
| // static
|
| bool JavaBitmap::RegisterJavaBitmap(JNIEnv* env) {
|
| - return RegisterNativesImpl(env);
|
| + return ui::RegisterNativesImpl(env);
|
| }
|
|
|
| static ScopedJavaLocalRef<jobject> CreateJavaBitmap(const gfx::Size& size) {
|
| - return Java_BitmapHelper_createBitmap(AttachCurrentThread(),
|
| + return ui::Java_BitmapHelper_createBitmap(AttachCurrentThread(),
|
| size.width(), size.height());
|
| }
|
|
|
| @@ -87,7 +87,7 @@
|
| DCHECK(!size.IsEmpty());
|
| JNIEnv* env = AttachCurrentThread();
|
| ScopedJavaLocalRef<jstring> jname(env, env->NewStringUTF(name));
|
| - ScopedJavaLocalRef<jobject> jobj(Java_BitmapHelper_decodeDrawableResource(
|
| + ScopedJavaLocalRef<jobject> jobj(ui::Java_BitmapHelper_decodeDrawableResource(
|
| env, jname.obj(), size.width(), size.height()));
|
| if (jobj.is_null())
|
| return SkBitmap();
|
|
|