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/webkit/renderer/cpp_bound_class.h | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
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/webkit/renderer/cpp_bound_class.h')
| -rw-r--r-- | chromium/webkit/renderer/cpp_bound_class.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/webkit/renderer/cpp_bound_class.h b/chromium/webkit/renderer/cpp_bound_class.h index 7cc6345290d..537a4c13879 100644 --- a/chromium/webkit/renderer/cpp_bound_class.h +++ b/chromium/webkit/renderer/cpp_bound_class.h @@ -25,7 +25,7 @@ #include "webkit/renderer/cpp_variant.h" #include "webkit/renderer/webkit_renderer_export.h" -namespace WebKit { +namespace blink { class WebFrame; } @@ -66,7 +66,7 @@ class WEBKIT_RENDERER_EXPORT CppBoundClass { // JavaScript as window.<classname>. The owner of this CppBoundClass object is // responsible for keeping it around while the frame is alive, and for // destroying it afterwards. - void BindToJavascript(WebKit::WebFrame* frame, const std::string& classname); + void BindToJavascript(blink::WebFrame* frame, const std::string& classname); // The type of callbacks. typedef base::Callback<void(const CppArgumentList&, CppVariant*)> Callback; |