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_dispatcher.h | |
| 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_dispatcher.h')
| -rw-r--r-- | chromium/content/renderer/java/java_bridge_dispatcher.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/content/renderer/java/java_bridge_dispatcher.h b/chromium/content/renderer/java/java_bridge_dispatcher.h index 29a10374590..325d5291851 100644 --- a/chromium/content/renderer/java/java_bridge_dispatcher.h +++ b/chromium/content/renderer/java/java_bridge_dispatcher.h @@ -30,18 +30,18 @@ class JavaBridgeDispatcher : public RenderViewObserver { private: // RenderViewObserver override: virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void DidClearWindowObject(WebKit::WebFrame* frame) OVERRIDE; + 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_; }; |