| 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 f8cfbb030c73fbd96dc9ebfad2d7f91a899394f2..5a6caf5834ee21d02a4ffeede938e9e36ffec9c2 100644
|
| --- a/chrome/renderer/chrome_content_renderer_client.h
|
| +++ b/chrome/renderer/chrome_content_renderer_client.h
|
| @@ -75,78 +75,78 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
|
| ChromeContentRendererClient();
|
| virtual ~ChromeContentRendererClient();
|
|
|
| - virtual void RenderThreadStarted() OVERRIDE;
|
| - virtual void RenderFrameCreated(content::RenderFrame* render_frame) OVERRIDE;
|
| - virtual void RenderViewCreated(content::RenderView* render_view) OVERRIDE;
|
| - virtual void SetNumberOfViews(int number_of_views) OVERRIDE;
|
| - virtual SkBitmap* GetSadPluginBitmap() OVERRIDE;
|
| - virtual SkBitmap* GetSadWebViewBitmap() OVERRIDE;
|
| - virtual std::string GetDefaultEncoding() OVERRIDE;
|
| + virtual void RenderThreadStarted() override;
|
| + virtual void RenderFrameCreated(content::RenderFrame* render_frame) override;
|
| + virtual void RenderViewCreated(content::RenderView* render_view) override;
|
| + virtual void SetNumberOfViews(int number_of_views) override;
|
| + virtual SkBitmap* GetSadPluginBitmap() override;
|
| + virtual SkBitmap* GetSadWebViewBitmap() override;
|
| + virtual std::string GetDefaultEncoding() override;
|
| virtual bool OverrideCreatePlugin(
|
| content::RenderFrame* render_frame,
|
| blink::WebLocalFrame* frame,
|
| const blink::WebPluginParams& params,
|
| - blink::WebPlugin** plugin) OVERRIDE;
|
| + blink::WebPlugin** plugin) override;
|
| virtual blink::WebPlugin* CreatePluginReplacement(
|
| content::RenderFrame* render_frame,
|
| - const base::FilePath& plugin_path) OVERRIDE;
|
| + const base::FilePath& plugin_path) override;
|
| virtual bool HasErrorPage(int http_status_code,
|
| - std::string* error_domain) OVERRIDE;
|
| + std::string* error_domain) override;
|
| virtual bool ShouldSuppressErrorPage(content::RenderFrame* render_frame,
|
| - const GURL& url) OVERRIDE;
|
| + const GURL& url) override;
|
| virtual void GetNavigationErrorStrings(
|
| content::RenderView* render_view,
|
| blink::WebFrame* frame,
|
| const blink::WebURLRequest& failed_request,
|
| const blink::WebURLError& error,
|
| std::string* error_html,
|
| - base::string16* error_description) OVERRIDE;
|
| + base::string16* error_description) override;
|
| virtual void DeferMediaLoad(content::RenderFrame* render_frame,
|
| - const base::Closure& closure) OVERRIDE;
|
| - virtual bool RunIdleHandlerWhenWidgetsHidden() OVERRIDE;
|
| - virtual bool AllowPopup() OVERRIDE;
|
| + const base::Closure& closure) override;
|
| + virtual bool RunIdleHandlerWhenWidgetsHidden() override;
|
| + virtual bool AllowPopup() override;
|
| 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;
|
| + bool* send_referrer) override;
|
| virtual bool WillSendRequest(blink::WebFrame* frame,
|
| ui::PageTransition transition_type,
|
| const GURL& url,
|
| const GURL& first_party_for_cookies,
|
| - GURL* new_url) OVERRIDE;
|
| + GURL* new_url) override;
|
| virtual void DidCreateScriptContext(blink::WebFrame* frame,
|
| v8::Handle<v8::Context> context,
|
| int extension_group,
|
| - int world_id) OVERRIDE;
|
| + 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 blink::WebPrescientNetworking* GetPrescientNetworking() OVERRIDE;
|
| + size_t length) override;
|
| + virtual bool IsLinkVisited(unsigned long long link_hash) override;
|
| + virtual blink::WebPrescientNetworking* GetPrescientNetworking() override;
|
| virtual bool ShouldOverridePageVisibilityState(
|
| const content::RenderFrame* render_frame,
|
| - blink::WebPageVisibilityState* override_state) OVERRIDE;
|
| + blink::WebPageVisibilityState* override_state) override;
|
| virtual const void* CreatePPAPIInterface(
|
| - const std::string& interface_name) OVERRIDE;
|
| - virtual bool IsExternalPepperPlugin(const std::string& module_name) OVERRIDE;
|
| + const std::string& interface_name) override;
|
| + virtual bool IsExternalPepperPlugin(const std::string& module_name) override;
|
| virtual blink::WebSpeechSynthesizer* OverrideSpeechSynthesizer(
|
| - blink::WebSpeechSynthesizerClient* client) OVERRIDE;
|
| + blink::WebSpeechSynthesizerClient* client) override;
|
| virtual bool ShouldReportDetailedMessageForSource(
|
| - const base::string16& source) const OVERRIDE;
|
| - virtual bool ShouldEnableSiteIsolationPolicy() const OVERRIDE;
|
| + const base::string16& source) const override;
|
| + virtual bool ShouldEnableSiteIsolationPolicy() const override;
|
| virtual blink::WebWorkerPermissionClientProxy*
|
| CreateWorkerPermissionClientProxy(content::RenderFrame* render_frame,
|
| - blink::WebFrame* frame) OVERRIDE;
|
| - virtual bool AllowPepperMediaStreamAPI(const GURL& url) OVERRIDE;
|
| + blink::WebFrame* frame) override;
|
| + virtual bool AllowPepperMediaStreamAPI(const GURL& url) override;
|
| virtual void AddKeySystems(
|
| - std::vector<content::KeySystemInfo>* key_systems) OVERRIDE;
|
| - virtual bool IsPluginAllowedToUseDevChannelAPIs() OVERRIDE;
|
| - virtual bool IsPluginAllowedToUseCompositorAPI(const GURL& url) OVERRIDE;
|
| - virtual bool IsPluginAllowedToUseVideoDecodeAPI(const GURL& url) OVERRIDE;
|
| + std::vector<content::KeySystemInfo>* key_systems) override;
|
| + virtual bool IsPluginAllowedToUseDevChannelAPIs() override;
|
| + virtual bool IsPluginAllowedToUseCompositorAPI(const GURL& url) override;
|
| + virtual bool IsPluginAllowedToUseVideoDecodeAPI(const GURL& url) override;
|
| virtual content::BrowserPluginDelegate* CreateBrowserPluginDelegate(
|
| content::RenderFrame* render_frame,
|
| - const std::string& mime_type) OVERRIDE;
|
| + const std::string& mime_type) override;
|
|
|
| #if defined(ENABLE_EXTENSIONS)
|
| // Takes ownership.
|
|
|