| Index: chrome/renderer/chrome_content_renderer_client.h
|
| diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h
|
| index a54a4ed4c3d8ea933633e5f2541df0352cb16666..2ec19809227f64284c0b13fc368a35e61dd5778c 100644
|
| --- a/chrome/renderer/chrome_content_renderer_client.h
|
| +++ b/chrome/renderer/chrome_content_renderer_client.h
|
| @@ -51,7 +51,7 @@ namespace visitedlink {
|
| class VisitedLinkSlave;
|
| }
|
|
|
| -namespace WebKit {
|
| +namespace blink {
|
| class WebSecurityOrigin;
|
| }
|
|
|
| @@ -72,19 +72,19 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
|
| virtual std::string GetDefaultEncoding() OVERRIDE;
|
| virtual bool OverrideCreatePlugin(
|
| content::RenderView* render_view,
|
| - WebKit::WebFrame* frame,
|
| - const WebKit::WebPluginParams& params,
|
| - WebKit::WebPlugin** plugin) OVERRIDE;
|
| - virtual WebKit::WebPlugin* CreatePluginReplacement(
|
| + blink::WebFrame* frame,
|
| + const blink::WebPluginParams& params,
|
| + blink::WebPlugin** plugin) OVERRIDE;
|
| + virtual blink::WebPlugin* CreatePluginReplacement(
|
| content::RenderView* render_view,
|
| const base::FilePath& plugin_path) OVERRIDE;
|
| virtual bool HasErrorPage(int http_status_code,
|
| std::string* error_domain) OVERRIDE;
|
| virtual bool ShouldSuppressErrorPage(const GURL& url) OVERRIDE;
|
| virtual void GetNavigationErrorStrings(
|
| - WebKit::WebFrame* frame,
|
| - const WebKit::WebURLRequest& failed_request,
|
| - const WebKit::WebURLError& error,
|
| + blink::WebFrame* frame,
|
| + const blink::WebURLRequest& failed_request,
|
| + const blink::WebURLError& error,
|
| const std::string& accept_languages,
|
| std::string* error_html,
|
| string16* error_description) OVERRIDE;
|
| @@ -92,32 +92,32 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
|
| const base::Closure& closure) OVERRIDE;
|
| virtual bool RunIdleHandlerWhenWidgetsHidden() OVERRIDE;
|
| virtual bool AllowPopup() OVERRIDE;
|
| - virtual bool ShouldFork(WebKit::WebFrame* frame,
|
| + virtual bool ShouldFork(blink::WebFrame* frame,
|
| const GURL& url,
|
| const std::string& http_method,
|
| bool is_initial_navigation,
|
| bool is_server_redirect,
|
| bool* send_referrer) OVERRIDE;
|
| - virtual bool WillSendRequest(WebKit::WebFrame* frame,
|
| + virtual bool WillSendRequest(blink::WebFrame* frame,
|
| content::PageTransition transition_type,
|
| const GURL& url,
|
| const GURL& first_party_for_cookies,
|
| GURL* new_url) OVERRIDE;
|
| virtual bool ShouldPumpEventsDuringCookieMessage() OVERRIDE;
|
| - virtual void DidCreateScriptContext(WebKit::WebFrame* frame,
|
| + virtual void DidCreateScriptContext(blink::WebFrame* frame,
|
| v8::Handle<v8::Context> context,
|
| int extension_group,
|
| int world_id) OVERRIDE;
|
| - virtual void WillReleaseScriptContext(WebKit::WebFrame* frame,
|
| + virtual void WillReleaseScriptContext(blink::WebFrame* frame,
|
| v8::Handle<v8::Context> context,
|
| int world_id) OVERRIDE;
|
| virtual unsigned long long VisitedLinkHash(const char* canonical_url,
|
| size_t length) OVERRIDE;
|
| virtual bool IsLinkVisited(unsigned long long link_hash) OVERRIDE;
|
| - virtual WebKit::WebPrescientNetworking* GetPrescientNetworking() OVERRIDE;
|
| + virtual blink::WebPrescientNetworking* GetPrescientNetworking() OVERRIDE;
|
| virtual bool ShouldOverridePageVisibilityState(
|
| const content::RenderView* render_view,
|
| - WebKit::WebPageVisibilityState* override_state) OVERRIDE;
|
| + blink::WebPageVisibilityState* override_state) OVERRIDE;
|
| virtual bool HandleGetCookieRequest(content::RenderView* sender,
|
| const GURL& url,
|
| const GURL& first_party_for_cookies,
|
| @@ -127,22 +127,22 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
|
| const GURL& first_party_for_cookies,
|
| const std::string& value) OVERRIDE;
|
| virtual bool AllowBrowserPlugin(
|
| - WebKit::WebPluginContainer* container) OVERRIDE;
|
| + blink::WebPluginContainer* container) OVERRIDE;
|
| virtual const void* CreatePPAPIInterface(
|
| const std::string& interface_name) OVERRIDE;
|
| virtual bool IsExternalPepperPlugin(const std::string& module_name) OVERRIDE;
|
| // TODO(victorhsieh): move to ChromeContentBrowserClient once we migrate
|
| // PPAPI FileIO host to browser.
|
| virtual bool IsPluginAllowedToCallRequestOSFileHandle(
|
| - WebKit::WebPluginContainer* container) OVERRIDE;
|
| - virtual WebKit::WebSpeechSynthesizer* OverrideSpeechSynthesizer(
|
| - WebKit::WebSpeechSynthesizerClient* client) OVERRIDE;
|
| + blink::WebPluginContainer* container) OVERRIDE;
|
| + virtual blink::WebSpeechSynthesizer* OverrideSpeechSynthesizer(
|
| + blink::WebSpeechSynthesizerClient* client) OVERRIDE;
|
| virtual bool ShouldReportDetailedMessageForSource(
|
| const base::string16& source) const OVERRIDE;
|
| virtual bool ShouldEnableSiteIsolationPolicy() const OVERRIDE;
|
| - virtual WebKit::WebWorkerPermissionClientProxy*
|
| + virtual blink::WebWorkerPermissionClientProxy*
|
| CreateWorkerPermissionClientProxy(content::RenderView* render_view,
|
| - WebKit::WebFrame* frame) OVERRIDE;
|
| + blink::WebFrame* frame) OVERRIDE;
|
| virtual bool AllowPepperMediaStreamAPI(const GURL& url) OVERRIDE;
|
| virtual void AddKeySystems(
|
| std::vector<content::KeySystemInfo>* key_systems) OVERRIDE;
|
| @@ -160,10 +160,10 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
|
| // and start over.
|
| void OnPurgeMemory();
|
|
|
| - static WebKit::WebPlugin* CreatePlugin(
|
| + static blink::WebPlugin* CreatePlugin(
|
| content::RenderView* render_view,
|
| - WebKit::WebFrame* frame,
|
| - const WebKit::WebPluginParams& params,
|
| + blink::WebFrame* frame,
|
| + const blink::WebPluginParams& params,
|
| const ChromeViewHostMsg_GetPluginInfo_Output& output);
|
|
|
| // TODO(mpcomplete): remove after we collect histogram data.
|
| @@ -182,11 +182,11 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
|
| // Gets extension by the given origin, regardless of whether the extension
|
| // is active in the current process.
|
| const extensions::Extension* GetExtensionByOrigin(
|
| - const WebKit::WebSecurityOrigin& origin) const;
|
| + const blink::WebSecurityOrigin& origin) const;
|
|
|
| // Returns true if the frame is navigating to an URL either into or out of an
|
| // extension app's extent.
|
| - bool CrossesExtensionExtents(WebKit::WebFrame* frame,
|
| + bool CrossesExtensionExtents(blink::WebFrame* frame,
|
| const GURL& new_url,
|
| const ExtensionSet& extensions,
|
| bool is_extension_url,
|
| @@ -201,7 +201,7 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
|
| const GURL& app_url,
|
| bool is_nacl_unrestricted,
|
| const extensions::Extension* extension,
|
| - WebKit::WebPluginParams* params);
|
| + blink::WebPluginParams* params);
|
|
|
| scoped_ptr<ChromeRenderProcessObserver> chrome_observer_;
|
| scoped_ptr<extensions::Dispatcher> extension_dispatcher_;
|
|
|