summaryrefslogtreecommitdiffstats
path: root/android_webview/native
diff options
context:
space:
mode:
authorjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-05 07:31:35 +0000
committerjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-05 07:31:35 +0000
commitb4b26c6204d2e7653120267efefd2e2eeccf6733 (patch)
tree99b44feb4e53b66337a12c149860c42d1e801bfe /android_webview/native
parentb9ab6f84ee7a5f7e5db266125ed6484d073dd052 (diff)
downloadchromium_src-b4b26c6204d2e7653120267efefd2e2eeccf6733.zip
chromium_src-b4b26c6204d2e7653120267efefd2e2eeccf6733.tar.gz
chromium_src-b4b26c6204d2e7653120267efefd2e2eeccf6733.tar.bz2
Pass ScopedJavaGlobalRef to bind() by value
ScopedJavaGlobalRef now has a copy constructor, so we can make the code simpler (no base::Owned() explanations) by just passing by value. BUG= Review URL: https://chromiumcodereview.appspot.com/11971007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/native')
-rw-r--r--android_webview/native/aw_contents.cc12
1 files changed, 5 insertions, 7 deletions
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index 479c70d..28f6f18 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -551,21 +551,19 @@ jint GetAwDrawGLFunction(JNIEnv* env, jclass) {
}
namespace {
-// |message| is passed as base::Owned, so it will automatically be deleted
-// when the callback goes out of scope.
-void DocumentHasImagesCallback(ScopedJavaGlobalRef<jobject>* message,
+void DocumentHasImagesCallback(const ScopedJavaGlobalRef<jobject>& message,
bool has_images) {
Java_AwContents_onDocumentHasImagesResponse(AttachCurrentThread(),
has_images,
- message->obj());
+ message.obj());
}
} // namespace
void AwContents::DocumentHasImages(JNIEnv* env, jobject obj, jobject message) {
- ScopedJavaGlobalRef<jobject>* j_message = new ScopedJavaGlobalRef<jobject>();
- j_message->Reset(env, message);
+ ScopedJavaGlobalRef<jobject> j_message;
+ j_message.Reset(env, message);
render_view_host_ext_->DocumentHasImages(
- base::Bind(&DocumentHasImagesCallback, base::Owned(j_message)));
+ base::Bind(&DocumentHasImagesCallback, j_message));
}
namespace {