Index: content/public/renderer/render_view.h |
diff --git a/content/public/renderer/render_view.h b/content/public/renderer/render_view.h |
index 0978535417ffc3cc281140c23881ff033617563a..01857c71812bfe64a713304032f980ec6aee172a 100644 |
--- a/content/public/renderer/render_view.h |
+++ b/content/public/renderer/render_view.h |
@@ -18,7 +18,7 @@ |
struct WebPreferences; |
-namespace WebKit { |
+namespace blink { |
class WebFrame; |
class WebNode; |
class WebPlugin; |
@@ -44,7 +44,7 @@ struct WebPluginInfo; |
class CONTENT_EXPORT RenderView : public IPC::Sender { |
public: |
// Returns the RenderView containing the given WebView. |
- static RenderView* FromWebView(WebKit::WebView* webview); |
+ static RenderView* FromWebView(blink::WebView* webview); |
// Returns the RenderView for the given routing ID. |
static RenderView* FromRoutingID(int routing_id); |
@@ -75,24 +75,24 @@ class CONTENT_EXPORT RenderView : public IPC::Sender { |
virtual void SetWebkitPreferences(const WebPreferences& preferences) = 0; |
// Returns the associated WebView. May return NULL when the view is closing. |
- virtual WebKit::WebView* GetWebView() = 0; |
+ virtual blink::WebView* GetWebView() = 0; |
// Gets the focused node. If no such node exists then the node will be isNull. |
- virtual WebKit::WebNode GetFocusedNode() const = 0; |
+ virtual blink::WebNode GetFocusedNode() const = 0; |
// Gets the node that the context menu was pressed over. |
- virtual WebKit::WebNode GetContextMenuNode() const = 0; |
+ virtual blink::WebNode GetContextMenuNode() const = 0; |
// Returns true if the parameter node is a textfield, text area, a content |
// editable div, or has an ARIA role of textbox. |
- virtual bool IsEditableNode(const WebKit::WebNode& node) const = 0; |
+ virtual bool IsEditableNode(const blink::WebNode& node) const = 0; |
// Create a new NPAPI/Pepper plugin depending on |info|. Returns NULL if no |
// plugin was found. |
- virtual WebKit::WebPlugin* CreatePlugin( |
- WebKit::WebFrame* frame, |
+ virtual blink::WebPlugin* CreatePlugin( |
+ blink::WebFrame* frame, |
const WebPluginInfo& info, |
- const WebKit::WebPluginParams& params) = 0; |
+ const blink::WebPluginParams& params) = 0; |
// Evaluates a string of JavaScript in a particular frame. |
virtual void EvaluateScript(const string16& frame_xpath, |
@@ -135,18 +135,18 @@ class CONTENT_EXPORT RenderView : public IPC::Sender { |
virtual void CancelContextMenu(int request_id) = 0; |
// Returns the current visibility of the WebView. |
- virtual WebKit::WebPageVisibilityState GetVisibilityState() const = 0; |
+ virtual blink::WebPageVisibilityState GetVisibilityState() const = 0; |
// Displays a modal alert dialog containing the given message. Returns |
// once the user dismisses the dialog. |
- virtual void RunModalAlertDialog(WebKit::WebFrame* frame, |
- const WebKit::WebString& message) = 0; |
+ virtual void RunModalAlertDialog(blink::WebFrame* frame, |
+ const blink::WebString& message) = 0; |
// The client should handle the navigation externally. |
virtual void LoadURLExternally( |
- WebKit::WebFrame* frame, |
- const WebKit::WebURLRequest& request, |
- WebKit::WebNavigationPolicy policy) = 0; |
+ blink::WebFrame* frame, |
+ const blink::WebURLRequest& request, |
+ blink::WebNavigationPolicy policy) = 0; |
// Used by plugins that load data in this RenderView to update the loading |
// notifications. |
@@ -163,7 +163,7 @@ class CONTENT_EXPORT RenderView : public IPC::Sender { |
virtual void ClearEditCommands() = 0; |
// Returns a collection of security info about |frame|. |
- virtual SSLStatus GetSSLStatusOfFrame(WebKit::WebFrame* frame) const = 0; |
+ virtual SSLStatus GetSSLStatusOfFrame(blink::WebFrame* frame) const = 0; |
// Returns |renderer_preferences_.accept_languages| value. |
virtual const std::string& GetAcceptLanguages() const = 0; |