Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / shell / renderer / shell_render_view_observer.h

diff --git a/src/content/shell/renderer/shell_render_view_observer.h b/src/content/shell/renderer/shell_render_view_observer.h
index c295c34..2d8092c 100644 (file)
--- a/src/content/shell/renderer/shell_render_view_observer.h
+++ b/src/content/shell/renderer/shell_render_view_observer.h
@@ -7,7 +7,7 @@
 
 #include "content/public/renderer/render_view_observer.h"
 
-namespace WebKit {
+namespace blink {
 class WebFrame;
 }
 
@@ -23,7 +23,8 @@ class ShellRenderViewObserver : public RenderViewObserver {
 
  private:
   // RenderViewObserver implementation.
-  virtual void DidClearWindowObject(WebKit::WebFrame* frame) OVERRIDE;
+  virtual void DidClearWindowObject(blink::WebLocalFrame* frame,
+                                    int world_id) OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(ShellRenderViewObserver);
 };