diff options
Diffstat (limited to 'content/renderer/java')
-rw-r--r-- | content/renderer/java/java_bridge_dispatcher.cc | 4 | ||||
-rw-r--r-- | content/renderer/java/java_bridge_dispatcher.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/content/renderer/java/java_bridge_dispatcher.cc b/content/renderer/java/java_bridge_dispatcher.cc index 633295a..f7e435c 100644 --- a/content/renderer/java/java_bridge_dispatcher.cc +++ b/content/renderer/java/java_bridge_dispatcher.cc @@ -65,7 +65,7 @@ void JavaBridgeDispatcher::DidClearWindowObject(blink::WebFrame* web_frame) { } void JavaBridgeDispatcher::OnAddNamedObject( - const string16& name, + const base::string16& name, const NPVariant_Param& variant_param) { DCHECK_EQ(variant_param.type, NPVARIANT_PARAM_SENDER_OBJECT_ROUTING_ID); @@ -95,7 +95,7 @@ void JavaBridgeDispatcher::OnAddNamedObject( objects_[name] = variant; } -void JavaBridgeDispatcher::OnRemoveNamedObject(const string16& name) { +void JavaBridgeDispatcher::OnRemoveNamedObject(const base::string16& name) { if (!channel_.get()) { DCHECK(objects_.empty()); return; diff --git a/content/renderer/java/java_bridge_dispatcher.h b/content/renderer/java/java_bridge_dispatcher.h index a50eb38..325d529 100644 --- a/content/renderer/java/java_bridge_dispatcher.h +++ b/content/renderer/java/java_bridge_dispatcher.h @@ -33,15 +33,15 @@ class JavaBridgeDispatcher : public RenderViewObserver { virtual void DidClearWindowObject(blink::WebFrame* frame) OVERRIDE; // Message handlers - void OnAddNamedObject(const string16& name, + void OnAddNamedObject(const base::string16& name, const NPVariant_Param& variant_param); - void OnRemoveNamedObject(const string16& name); + void OnRemoveNamedObject(const base::string16& name); void EnsureChannelIsSetUp(); // Objects that will be bound to the window when the window object is next // cleared. We hold a ref to these. - typedef std::map<string16, NPVariant> ObjectMap; + typedef std::map<base::string16, NPVariant> ObjectMap; ObjectMap objects_; scoped_refptr<JavaBridgeChannel> channel_; }; |