| 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 376ecb1e4818d364ee9d4dfa6fc24e83732d32bf..633295a2103c32b38f51d052ee8a5d2c98bd3f9a 100644
|
| --- a/content/renderer/java/java_bridge_dispatcher.cc
|
| +++ b/content/renderer/java/java_bridge_dispatcher.cc
|
| @@ -36,7 +36,7 @@ void JavaBridgeDispatcher::EnsureChannelIsSetUp() {
|
| JavaBridgeDispatcher::~JavaBridgeDispatcher() {
|
| for (ObjectMap::const_iterator iter = objects_.begin();
|
| iter != objects_.end(); ++iter) {
|
| - WebKit::WebBindings::releaseObject(NPVARIANT_TO_OBJECT(iter->second));
|
| + blink::WebBindings::releaseObject(NPVARIANT_TO_OBJECT(iter->second));
|
| }
|
| }
|
|
|
| @@ -51,7 +51,7 @@ bool JavaBridgeDispatcher::OnMessageReceived(const IPC::Message& msg) {
|
| return handled;
|
| }
|
|
|
| -void JavaBridgeDispatcher::DidClearWindowObject(WebKit::WebFrame* web_frame) {
|
| +void JavaBridgeDispatcher::DidClearWindowObject(blink::WebFrame* web_frame) {
|
| // Note that we have to (re)bind all objects, as they will have been unbound
|
| // when the window object was cleared.
|
| for (ObjectMap::const_iterator iter = objects_.begin();
|
| @@ -90,7 +90,7 @@ void JavaBridgeDispatcher::OnAddNamedObject(
|
| // OnRemoveNamedObject() is called for that object.
|
| ObjectMap::iterator iter = objects_.find(name);
|
| if (iter != objects_.end()) {
|
| - WebKit::WebBindings::releaseObject(NPVARIANT_TO_OBJECT(iter->second));
|
| + blink::WebBindings::releaseObject(NPVARIANT_TO_OBJECT(iter->second));
|
| }
|
| objects_[name] = variant;
|
| }
|
| @@ -106,7 +106,7 @@ void JavaBridgeDispatcher::OnRemoveNamedObject(const string16& name) {
|
| // is present.
|
| ObjectMap::iterator iter = objects_.find(name);
|
| DCHECK(iter != objects_.end());
|
| - WebKit::WebBindings::releaseObject(NPVARIANT_TO_OBJECT(iter->second));
|
| + blink::WebBindings::releaseObject(NPVARIANT_TO_OBJECT(iter->second));
|
| objects_.erase(iter);
|
| }
|
|
|
|
|