| Index: extensions/browser/extension_host.h
|
| diff --git a/extensions/browser/extension_host.h b/extensions/browser/extension_host.h
|
| index e732a25155f00739ae3925fcb94b5cad23d6937f..def200d3a1dca2e35a34660f152f967211702dc0 100644
|
| --- a/extensions/browser/extension_host.h
|
| +++ b/extensions/browser/extension_host.h
|
| @@ -50,7 +50,7 @@ class ExtensionHost : public content::WebContentsDelegate,
|
| ExtensionHost(const Extension* extension,
|
| content::SiteInstance* site_instance,
|
| const GURL& url, ViewType host_type);
|
| - virtual ~ExtensionHost();
|
| + ~ExtensionHost() override;
|
|
|
| const Extension* extension() const { return extension_; }
|
| const std::string& extension_id() const { return extension_id_; }
|
| @@ -76,41 +76,36 @@ class ExtensionHost : public content::WebContentsDelegate,
|
| void CreateRenderViewSoon();
|
|
|
| // content::WebContentsObserver
|
| - virtual bool OnMessageReceived(const IPC::Message& message) override;
|
| - virtual void RenderViewCreated(
|
| - content::RenderViewHost* render_view_host) override;
|
| - virtual void RenderViewDeleted(
|
| - content::RenderViewHost* render_view_host) override;
|
| - virtual void RenderViewReady() override;
|
| - virtual void RenderProcessGone(base::TerminationStatus status) override;
|
| - virtual void DocumentAvailableInMainFrame() override;
|
| - virtual void DidStopLoading(
|
| - content::RenderViewHost* render_view_host) override;
|
| + bool OnMessageReceived(const IPC::Message& message) override;
|
| + void RenderViewCreated(content::RenderViewHost* render_view_host) override;
|
| + void RenderViewDeleted(content::RenderViewHost* render_view_host) override;
|
| + void RenderViewReady() override;
|
| + void RenderProcessGone(base::TerminationStatus status) override;
|
| + void DocumentAvailableInMainFrame() override;
|
| + void DidStopLoading(content::RenderViewHost* render_view_host) override;
|
|
|
| // content::WebContentsDelegate
|
| - virtual content::JavaScriptDialogManager*
|
| - GetJavaScriptDialogManager() override;
|
| - virtual void AddNewContents(content::WebContents* source,
|
| - content::WebContents* new_contents,
|
| - WindowOpenDisposition disposition,
|
| - const gfx::Rect& initial_pos,
|
| - bool user_gesture,
|
| - bool* was_blocked) override;
|
| - virtual void CloseContents(content::WebContents* contents) override;
|
| - virtual void RequestMediaAccessPermission(
|
| + content::JavaScriptDialogManager* GetJavaScriptDialogManager() override;
|
| + void AddNewContents(content::WebContents* source,
|
| + content::WebContents* new_contents,
|
| + WindowOpenDisposition disposition,
|
| + const gfx::Rect& initial_pos,
|
| + bool user_gesture,
|
| + bool* was_blocked) override;
|
| + void CloseContents(content::WebContents* contents) override;
|
| + void RequestMediaAccessPermission(
|
| content::WebContents* web_contents,
|
| const content::MediaStreamRequest& request,
|
| const content::MediaResponseCallback& callback) override;
|
| - virtual bool CheckMediaAccessPermission(
|
| - content::WebContents* web_contents,
|
| - const GURL& security_origin,
|
| - content::MediaStreamType type) override;
|
| - virtual bool IsNeverVisible(content::WebContents* web_contents) override;
|
| + bool CheckMediaAccessPermission(content::WebContents* web_contents,
|
| + const GURL& security_origin,
|
| + content::MediaStreamType type) override;
|
| + bool IsNeverVisible(content::WebContents* web_contents) override;
|
|
|
| // content::NotificationObserver
|
| - virtual void Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) override;
|
| + void Observe(int type,
|
| + const content::NotificationSource& source,
|
| + const content::NotificationDetails& details) override;
|
|
|
| protected:
|
| content::NotificationRegistrar* registrar() { return ®istrar_; }
|
|
|