Index: android_webview/renderer/aw_render_view_ext.h |
diff --git a/android_webview/renderer/aw_render_view_ext.h b/android_webview/renderer/aw_render_view_ext.h |
index aaa565f01cd3852b590d66cf249eabc1b8309109..e2f4049700717885dd15c27172e62f90770f1b74 100644 |
--- a/android_webview/renderer/aw_render_view_ext.h |
+++ b/android_webview/renderer/aw_render_view_ext.h |
@@ -13,12 +13,12 @@ |
#include "third_party/skia/include/core/SkColor.h" |
#include "ui/gfx/size.h" |
-namespace WebKit { |
+namespace blink { |
class WebNode; |
class WebURL; |
-} // namespace WebKit |
+} // namespace blink |
namespace android_webview { |
@@ -26,7 +26,7 @@ namespace android_webview { |
// implementation of miscellaneous WebView functions that we need to poke |
// WebKit directly to implement (and that aren't needed in the chrome app). |
class AwRenderViewExt : public content::RenderViewObserver, |
- public WebKit::WebPermissionClient { |
+ public blink::WebPermissionClient { |
public: |
static void RenderViewCreated(content::RenderView* render_view); |
@@ -36,9 +36,9 @@ class AwRenderViewExt : public content::RenderViewObserver, |
// RenderView::Observer: |
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |
- virtual void DidCommitProvisionalLoad(WebKit::WebFrame* frame, |
+ virtual void DidCommitProvisionalLoad(blink::WebFrame* frame, |
bool is_new_navigation) OVERRIDE; |
- virtual void FocusedNodeChanged(const WebKit::WebNode& node) OVERRIDE; |
+ virtual void FocusedNodeChanged(const blink::WebNode& node) OVERRIDE; |
virtual void DidCommitCompositorFrame() OVERRIDE; |
virtual void DidUpdateLayout() OVERRIDE; |
virtual void Navigate(const GURL& url) OVERRIDE; |
@@ -61,17 +61,17 @@ class AwRenderViewExt : public content::RenderViewObserver, |
void CheckContentsSize(); |
- // WebKit::WebPermissionClient implementation. |
+ // blink::WebPermissionClient implementation. |
virtual bool allowDisplayingInsecureContent( |
- WebKit::WebFrame* frame, |
+ blink::WebFrame* frame, |
bool enabled_per_settings, |
- const WebKit::WebSecurityOrigin& origin, |
- const WebKit::WebURL& url) OVERRIDE; |
+ const blink::WebSecurityOrigin& origin, |
+ const blink::WebURL& url) OVERRIDE; |
virtual bool allowRunningInsecureContent( |
- WebKit::WebFrame* frame, |
+ blink::WebFrame* frame, |
bool enabled_per_settings, |
- const WebKit::WebSecurityOrigin& origin, |
- const WebKit::WebURL& url) OVERRIDE; |
+ const blink::WebSecurityOrigin& origin, |
+ const blink::WebURL& url) OVERRIDE; |
bool capture_picture_enabled_; |