| Index: content/renderer/java/java_bridge_dispatcher.cc
|
| diff --git a/content/renderer/java/java_bridge_dispatcher.cc b/content/renderer/java/java_bridge_dispatcher.cc
|
| index 633295a2103c32b38f51d052ee8a5d2c98bd3f9a..f7e435cf2b10df0506aca7e824123e3d3edc1166 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;
|
|
|