Index: extensions/browser/api/web_view/web_view_internal_api.h |
diff --git a/extensions/browser/api/web_view/web_view_internal_api.h b/extensions/browser/api/web_view/web_view_internal_api.h |
index a242e18ee6f27f0fd5d29c2275fe70bd34f13a97..7aebf6303dd0943e4aee9f279e6f38865f98e31f 100644 |
--- a/extensions/browser/api/web_view/web_view_internal_api.h |
+++ b/extensions/browser/api/web_view/web_view_internal_api.h |
@@ -24,10 +24,10 @@ class WebViewInternalExtensionFunction : public AsyncExtensionFunction { |
WebViewInternalExtensionFunction() {} |
protected: |
- virtual ~WebViewInternalExtensionFunction() {} |
+ ~WebViewInternalExtensionFunction() override {} |
// ExtensionFunction implementation. |
- virtual bool RunAsync() override final; |
+ bool RunAsync() final; |
private: |
virtual bool RunAsyncSafe(WebViewGuest* guest) = 0; |
@@ -41,11 +41,11 @@ class WebViewInternalNavigateFunction |
WebViewInternalNavigateFunction() {} |
protected: |
- virtual ~WebViewInternalNavigateFunction() {} |
+ ~WebViewInternalNavigateFunction() override {} |
private: |
// WebViewInternalExtensionFunction implementation. |
- virtual bool RunAsyncSafe(WebViewGuest* guest) override; |
+ bool RunAsyncSafe(WebViewGuest* guest) override; |
DISALLOW_COPY_AND_ASSIGN(WebViewInternalNavigateFunction); |
}; |
@@ -56,16 +56,16 @@ class WebViewInternalExecuteCodeFunction |
WebViewInternalExecuteCodeFunction(); |
protected: |
- virtual ~WebViewInternalExecuteCodeFunction(); |
+ ~WebViewInternalExecuteCodeFunction() override; |
// Initialize |details_| if it hasn't already been. |
- virtual bool Init() override; |
- virtual bool ShouldInsertCSS() const override; |
- virtual bool CanExecuteScriptOnPage() override; |
+ bool Init() override; |
+ bool ShouldInsertCSS() const override; |
+ bool CanExecuteScriptOnPage() override; |
// Guarded by a process ID check. |
- virtual extensions::ScriptExecutor* GetScriptExecutor() override final; |
- virtual bool IsWebView() const override; |
- virtual const GURL& GetWebViewSrc() const override; |
+ extensions::ScriptExecutor* GetScriptExecutor() final; |
+ bool IsWebView() const override; |
+ const GURL& GetWebViewSrc() const override; |
private: |
// Contains extension resource built from path of file which is |
@@ -85,11 +85,11 @@ class WebViewInternalExecuteScriptFunction |
WebViewInternalExecuteScriptFunction(); |
protected: |
- virtual ~WebViewInternalExecuteScriptFunction() {} |
+ ~WebViewInternalExecuteScriptFunction() override {} |
- virtual void OnExecuteCodeFinished(const std::string& error, |
- const GURL& on_url, |
- const base::ListValue& result) override; |
+ void OnExecuteCodeFinished(const std::string& error, |
+ const GURL& on_url, |
+ const base::ListValue& result) override; |
DECLARE_EXTENSION_FUNCTION("webViewInternal.executeScript", |
WEBVIEWINTERNAL_EXECUTESCRIPT) |
@@ -104,9 +104,9 @@ class WebViewInternalInsertCSSFunction |
WebViewInternalInsertCSSFunction(); |
protected: |
- virtual ~WebViewInternalInsertCSSFunction() {} |
+ ~WebViewInternalInsertCSSFunction() override {} |
- virtual bool ShouldInsertCSS() const override; |
+ bool ShouldInsertCSS() const override; |
DECLARE_EXTENSION_FUNCTION("webViewInternal.insertCSS", |
WEBVIEWINTERNAL_INSERTCSS) |
@@ -123,13 +123,13 @@ class WebViewInternalCaptureVisibleRegionFunction |
WebViewInternalCaptureVisibleRegionFunction(); |
protected: |
- virtual ~WebViewInternalCaptureVisibleRegionFunction(); |
+ ~WebViewInternalCaptureVisibleRegionFunction() override; |
private: |
// extensions::CaptureWebContentsFunction implementation. |
- virtual bool IsScreenshotEnabled() override; |
- virtual content::WebContents* GetWebContentsForID(int id) override; |
- virtual void OnCaptureFailure(FailureReason reason) override; |
+ bool IsScreenshotEnabled() override; |
+ content::WebContents* GetWebContentsForID(int id) override; |
+ void OnCaptureFailure(FailureReason reason) override; |
DISALLOW_COPY_AND_ASSIGN(WebViewInternalCaptureVisibleRegionFunction); |
}; |
@@ -142,10 +142,10 @@ class WebViewInternalSetNameFunction : public WebViewInternalExtensionFunction { |
WebViewInternalSetNameFunction(); |
protected: |
- virtual ~WebViewInternalSetNameFunction(); |
+ ~WebViewInternalSetNameFunction() override; |
private: |
- virtual bool RunAsyncSafe(WebViewGuest* guest) override; |
+ bool RunAsyncSafe(WebViewGuest* guest) override; |
DISALLOW_COPY_AND_ASSIGN(WebViewInternalSetNameFunction); |
}; |
@@ -159,10 +159,10 @@ class WebViewInternalSetAllowTransparencyFunction : |
WebViewInternalSetAllowTransparencyFunction(); |
protected: |
- virtual ~WebViewInternalSetAllowTransparencyFunction(); |
+ ~WebViewInternalSetAllowTransparencyFunction() override; |
private: |
- virtual bool RunAsyncSafe(WebViewGuest* guest) override; |
+ bool RunAsyncSafe(WebViewGuest* guest) override; |
DISALLOW_COPY_AND_ASSIGN(WebViewInternalSetAllowTransparencyFunction); |
}; |
@@ -175,10 +175,10 @@ class WebViewInternalSetZoomFunction : public WebViewInternalExtensionFunction { |
WebViewInternalSetZoomFunction(); |
protected: |
- virtual ~WebViewInternalSetZoomFunction(); |
+ ~WebViewInternalSetZoomFunction() override; |
private: |
- virtual bool RunAsyncSafe(WebViewGuest* guest) override; |
+ bool RunAsyncSafe(WebViewGuest* guest) override; |
DISALLOW_COPY_AND_ASSIGN(WebViewInternalSetZoomFunction); |
}; |
@@ -191,10 +191,10 @@ class WebViewInternalGetZoomFunction : public WebViewInternalExtensionFunction { |
WebViewInternalGetZoomFunction(); |
protected: |
- virtual ~WebViewInternalGetZoomFunction(); |
+ ~WebViewInternalGetZoomFunction() override; |
private: |
- virtual bool RunAsyncSafe(WebViewGuest* guest) override; |
+ bool RunAsyncSafe(WebViewGuest* guest) override; |
DISALLOW_COPY_AND_ASSIGN(WebViewInternalGetZoomFunction); |
}; |
@@ -209,11 +209,11 @@ class WebViewInternalFindFunction : public WebViewInternalExtensionFunction { |
using WebViewInternalExtensionFunction::SendResponse; |
protected: |
- virtual ~WebViewInternalFindFunction(); |
+ ~WebViewInternalFindFunction() override; |
private: |
// WebViewInternalExtensionFunction implementation. |
- virtual bool RunAsyncSafe(WebViewGuest* guest) override; |
+ bool RunAsyncSafe(WebViewGuest* guest) override; |
DISALLOW_COPY_AND_ASSIGN(WebViewInternalFindFunction); |
}; |
@@ -227,11 +227,11 @@ class WebViewInternalStopFindingFunction |
WebViewInternalStopFindingFunction(); |
protected: |
- virtual ~WebViewInternalStopFindingFunction(); |
+ ~WebViewInternalStopFindingFunction() override; |
private: |
// WebViewInternalExtensionFunction implementation. |
- virtual bool RunAsyncSafe(WebViewGuest* guest) override; |
+ bool RunAsyncSafe(WebViewGuest* guest) override; |
DISALLOW_COPY_AND_ASSIGN(WebViewInternalStopFindingFunction); |
}; |
@@ -245,10 +245,10 @@ class WebViewInternalLoadDataWithBaseUrlFunction |
WebViewInternalLoadDataWithBaseUrlFunction(); |
protected: |
- virtual ~WebViewInternalLoadDataWithBaseUrlFunction(); |
+ ~WebViewInternalLoadDataWithBaseUrlFunction() override; |
private: |
- virtual bool RunAsyncSafe(WebViewGuest* guest) override; |
+ bool RunAsyncSafe(WebViewGuest* guest) override; |
DISALLOW_COPY_AND_ASSIGN(WebViewInternalLoadDataWithBaseUrlFunction); |
}; |
@@ -260,11 +260,11 @@ class WebViewInternalGoFunction : public WebViewInternalExtensionFunction { |
WebViewInternalGoFunction(); |
protected: |
- virtual ~WebViewInternalGoFunction(); |
+ ~WebViewInternalGoFunction() override; |
private: |
// WebViewInternalExtensionFunction implementation. |
- virtual bool RunAsyncSafe(WebViewGuest* guest) override; |
+ bool RunAsyncSafe(WebViewGuest* guest) override; |
DISALLOW_COPY_AND_ASSIGN(WebViewInternalGoFunction); |
}; |
@@ -276,11 +276,11 @@ class WebViewInternalReloadFunction : public WebViewInternalExtensionFunction { |
WebViewInternalReloadFunction(); |
protected: |
- virtual ~WebViewInternalReloadFunction(); |
+ ~WebViewInternalReloadFunction() override; |
private: |
// WebViewInternalExtensionFunction implementation. |
- virtual bool RunAsyncSafe(WebViewGuest* guest) override; |
+ bool RunAsyncSafe(WebViewGuest* guest) override; |
DISALLOW_COPY_AND_ASSIGN(WebViewInternalReloadFunction); |
}; |
@@ -294,11 +294,11 @@ class WebViewInternalSetPermissionFunction |
WebViewInternalSetPermissionFunction(); |
protected: |
- virtual ~WebViewInternalSetPermissionFunction(); |
+ ~WebViewInternalSetPermissionFunction() override; |
private: |
// WebViewInternalExtensionFunction implementation. |
- virtual bool RunAsyncSafe(WebViewGuest* guest) override; |
+ bool RunAsyncSafe(WebViewGuest* guest) override; |
DISALLOW_COPY_AND_ASSIGN(WebViewInternalSetPermissionFunction); |
}; |
@@ -312,11 +312,11 @@ class WebViewInternalOverrideUserAgentFunction |
WebViewInternalOverrideUserAgentFunction(); |
protected: |
- virtual ~WebViewInternalOverrideUserAgentFunction(); |
+ ~WebViewInternalOverrideUserAgentFunction() override; |
private: |
// WebViewInternalExtensionFunction implementation. |
- virtual bool RunAsyncSafe(WebViewGuest* guest) override; |
+ bool RunAsyncSafe(WebViewGuest* guest) override; |
DISALLOW_COPY_AND_ASSIGN(WebViewInternalOverrideUserAgentFunction); |
}; |
@@ -328,11 +328,11 @@ class WebViewInternalStopFunction : public WebViewInternalExtensionFunction { |
WebViewInternalStopFunction(); |
protected: |
- virtual ~WebViewInternalStopFunction(); |
+ ~WebViewInternalStopFunction() override; |
private: |
// WebViewInternalExtensionFunction implementation. |
- virtual bool RunAsyncSafe(WebViewGuest* guest) override; |
+ bool RunAsyncSafe(WebViewGuest* guest) override; |
DISALLOW_COPY_AND_ASSIGN(WebViewInternalStopFunction); |
}; |
@@ -346,11 +346,11 @@ class WebViewInternalTerminateFunction |
WebViewInternalTerminateFunction(); |
protected: |
- virtual ~WebViewInternalTerminateFunction(); |
+ ~WebViewInternalTerminateFunction() override; |
private: |
// WebViewInternalExtensionFunction implementation. |
- virtual bool RunAsyncSafe(WebViewGuest* guest) override; |
+ bool RunAsyncSafe(WebViewGuest* guest) override; |
DISALLOW_COPY_AND_ASSIGN(WebViewInternalTerminateFunction); |
}; |
@@ -364,11 +364,11 @@ class WebViewInternalClearDataFunction |
WebViewInternalClearDataFunction(); |
protected: |
- virtual ~WebViewInternalClearDataFunction(); |
+ ~WebViewInternalClearDataFunction() override; |
private: |
// WebViewInternalExtensionFunction implementation. |
- virtual bool RunAsyncSafe(WebViewGuest* guest) override; |
+ bool RunAsyncSafe(WebViewGuest* guest) override; |
uint32 GetRemovalMask(); |
void ClearDataDone(); |