diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/content/renderer/java/java_bridge_channel.cc | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/content/renderer/java/java_bridge_channel.cc')
| -rw-r--r-- | chromium/content/renderer/java/java_bridge_channel.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/content/renderer/java/java_bridge_channel.cc b/chromium/content/renderer/java/java_bridge_channel.cc index 235425ab4ff..0d6d3f6c35f 100644 --- a/chromium/content/renderer/java/java_bridge_channel.cc +++ b/chromium/content/renderer/java/java_bridge_channel.cc @@ -27,12 +27,12 @@ JavaBridgeChannel::JavaBridgeChannel() : peer_owner_id_(new struct _NPP) { // Register the dummy owner Id for our peer (the Browser process) as an object // owner, and have all objects received from the peer owned by it. - WebKit::WebBindings::registerObjectOwner(peer_owner_id_.get()); + blink::WebBindings::registerObjectOwner(peer_owner_id_.get()); SetDefaultNPObjectOwner(peer_owner_id_.get()); } JavaBridgeChannel::~JavaBridgeChannel() { - WebKit::WebBindings::unregisterObjectOwner(peer_owner_id_.get()); + blink::WebBindings::unregisterObjectOwner(peer_owner_id_.get()); } int JavaBridgeChannel::GenerateRouteID() { |