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

Unified Diff: content/browser/renderer_host/java/java_bridge_dispatcher_host.cc

Issue 16907002: Update Android to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 months 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
Index: content/browser/renderer_host/java/java_bridge_dispatcher_host.cc
diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc
index 05bec13f8c920cff9a3be1527c2fbc1bcac8428c..4f1a295dd6186bcb0f39935da8344c22598a223d 100644
--- a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc
+++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc
@@ -140,7 +140,7 @@ void JavaBridgeDispatcherHost::CreateObjectStub(NPObject* object,
int route_id) {
DCHECK_EQ(g_background_thread.Get().message_loop(),
base::MessageLoop::current());
- if (!channel_) {
+ if (!channel_.get()) {
channel_ = JavaBridgeChannelHost::GetJavaBridgeChannelHost(
render_view_host()->GetProcess()->GetID(),
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
@@ -156,8 +156,8 @@ void JavaBridgeDispatcherHost::CreateObjectStub(NPObject* object,
// window message queue when a method on a renderer-side object causes a
// dialog to be displayed, and the Java Bridge does not need this
// functionality. The page URL is also not required.
- stubs_.push_back(
- (new NPObjectStub(object, channel_, route_id, 0, GURL()))->AsWeakPtr());
+ stubs_.push_back((new NPObjectStub(
+ object, channel_.get(), route_id, 0, GURL()))->AsWeakPtr());
// The NPObjectStub takes a reference to the NPObject. Release the ref added
// in CreateNPVariantParam().

Powered by Google App Engine
This is Rietveld 408576698