diff options
Diffstat (limited to 'content/browser/renderer_host/java')
4 files changed, 10 insertions, 9 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 6d792e7..562517a 100644 --- a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc +++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc @@ -59,7 +59,7 @@ JavaBridgeDispatcherHost::~JavaBridgeDispatcherHost() { base::Bind(&CleanUpStubs, stubs_)); } -void JavaBridgeDispatcherHost::AddNamedObject(const string16& name, +void JavaBridgeDispatcherHost::AddNamedObject(const base::string16& name, NPObject* object) { NPVariant_Param variant_param; CreateNPVariantParam(object, &variant_param); @@ -68,7 +68,7 @@ void JavaBridgeDispatcherHost::AddNamedObject(const string16& name, render_view_host_->GetRoutingID(), name, variant_param)); } -void JavaBridgeDispatcherHost::RemoveNamedObject(const string16& name) { +void JavaBridgeDispatcherHost::RemoveNamedObject(const base::string16& name) { // On receipt of this message, the JavaBridgeDispatcher will drop its // reference to the corresponding proxy object. When the last reference is // removed, the proxy object will delete its NPObjectProxy, which will cause 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 94ee632..21e47c0 100644 --- a/content/browser/renderer_host/java/java_bridge_dispatcher_host.h +++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host.h @@ -42,8 +42,8 @@ class JavaBridgeDispatcherHost // to |object|, which is manipulated on the background thread. This class // holds a reference to |object| for the time that the proxy object is bound // to the window object. - void AddNamedObject(const string16& name, NPObject* object); - void RemoveNamedObject(const string16& name); + void AddNamedObject(const base::string16& name, NPObject* object); + void RemoveNamedObject(const base::string16& name); // Since this object is ref-counted, it might outlive render_view_host_. void RenderViewDeleted(); diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc b/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc index f06d9fe..02cf4dc 100644 --- a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc +++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc @@ -31,7 +31,7 @@ JavaBridgeDispatcherHostManager::~JavaBridgeDispatcherHostManager() { DCHECK_EQ(0U, instances_.size()); } -void JavaBridgeDispatcherHostManager::AddNamedObject(const string16& name, +void JavaBridgeDispatcherHostManager::AddNamedObject(const base::string16& name, NPObject* object) { // Record this object in a map so that we can add it into RenderViewHosts // created later. The JavaBridgeDispatcherHost instances will take a @@ -67,7 +67,8 @@ void JavaBridgeDispatcherHostManager::SetRetainedObjectSet( } } -void JavaBridgeDispatcherHostManager::RemoveNamedObject(const string16& name) { +void JavaBridgeDispatcherHostManager::RemoveNamedObject( + const base::string16& name) { ObjectMap::iterator iter = objects_.find(name); if (iter == objects_.end()) { return; diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h b/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h index e3d629a..29523b5 100644 --- a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h +++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h @@ -34,8 +34,8 @@ class JavaBridgeDispatcherHostManager // These methods add or remove the object to each JavaBridgeDispatcherHost. // Each one holds a reference to the NPObject while the object is bound to // the corresponding RenderView. See JavaBridgeDispatcherHost for details. - void AddNamedObject(const string16& name, NPObject* object); - void RemoveNamedObject(const string16& name); + void AddNamedObject(const base::string16& name, NPObject* object); + void RemoveNamedObject(const base::string16& name); void OnGetChannelHandle(RenderViewHost* render_view_host, IPC::Message* reply_msg); @@ -60,7 +60,7 @@ class JavaBridgeDispatcherHostManager typedef std::map<RenderViewHost*, scoped_refptr<JavaBridgeDispatcherHost> > InstanceMap; InstanceMap instances_; - typedef std::map<string16, NPObject*> ObjectMap; + typedef std::map<base::string16, NPObject*> ObjectMap; ObjectMap objects_; JavaObjectWeakGlobalRef retained_object_set_; |