diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 00:24:58 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 00:24:58 +0000 |
| commit | 9b52c077ea9f3dff1b8ef7bac0f64febd1abd63e (patch) | |
| tree | 06a6c70232e19269f199d6225da2149d307b6cf9 /content | |
| parent | d0d49dd80ebcb6c7ca6b8e793a41866b4ad50eda (diff) | |
| download | chromium_src-9b52c077ea9f3dff1b8ef7bac0f64febd1abd63e.zip chromium_src-9b52c077ea9f3dff1b8ef7bac0f64febd1abd63e.tar.gz chromium_src-9b52c077ea9f3dff1b8ef7bac0f64febd1abd63e.tar.bz2 | |
Android build: content_unittests work
BUG=None
TEST=
Review URL: http://codereview.chromium.org/9141033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119149 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/java/java_bridge_dispatcher_host.cc | 5 | ||||
| -rw-r--r-- | content/browser/renderer_host/java/java_bridge_dispatcher_host.h | 8 |
2 files changed, 7 insertions, 6 deletions
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 cbdf5fe..913f734 100644 --- a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc +++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -14,6 +14,7 @@ #include "content/common/npobject_stub.h" #include "content/common/npobject_util.h" // For CreateNPVariantParam() #include "content/public/browser/browser_thread.h" +#include "content/public/browser/render_process_host.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" using content::BrowserThread; @@ -128,7 +129,7 @@ void JavaBridgeDispatcherHost::CreateObjectStub(NPObject* object, DCHECK_EQ(g_background_thread.Get().message_loop(), MessageLoop::current()); if (!channel_) { channel_ = JavaBridgeChannelHost::GetJavaBridgeChannelHost( - render_view_host()->process()->id(), + render_view_host()->process()->GetID(), BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); } diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host.h b/content/browser/renderer_host/java/java_bridge_dispatcher_host.h index a5999c2..1a34a0b 100644 --- a/content/browser/renderer_host/java/java_bridge_dispatcher_host.h +++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include "base/memory/ref_counted.h" #include "base/string16.h" -#include "content/browser/renderer_host/render_view_host_observer.h" +#include "content/public/browser/render_view_host_observer.h" class NPChannelBase; class RenderViewHost; @@ -22,7 +22,7 @@ struct NPVariant_Param; // for each RenderViewHost. class JavaBridgeDispatcherHost : public base::RefCountedThreadSafe<JavaBridgeDispatcherHost>, - public RenderViewHostObserver { + public content::RenderViewHostObserver { public: // We hold a weak pointer to the RenderViewhost. It must outlive this object. JavaBridgeDispatcherHost(RenderViewHost* render_view_host); @@ -47,7 +47,7 @@ class JavaBridgeDispatcherHost private: friend class base::RefCountedThreadSafe<JavaBridgeDispatcherHost>; - ~JavaBridgeDispatcherHost(); + virtual ~JavaBridgeDispatcherHost(); // RenderViewHostObserver override: virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |