summaryrefslogtreecommitdiffstats
path: root/content/shell/browser/layout_test
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-21 04:44:09 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-21 11:44:31 +0000
commite933b3eb38cf13b7b96141214fa266cf499459ff (patch)
treeb51322928a2bb475e84a6630b1a11a652ecefefe /content/shell/browser/layout_test
parentc072fff949cad2790f4cb731097c276897b37d0b (diff)
downloadchromium_src-e933b3eb38cf13b7b96141214fa266cf499459ff.zip
chromium_src-e933b3eb38cf13b7b96141214fa266cf499459ff.tar.gz
chromium_src-e933b3eb38cf13b7b96141214fa266cf499459ff.tar.bz2
Standardize usage of virtual/override/final in content/
This patch was automatically generated by applying clang fixit hints generated by the plugin to the source tree. BUG=417463 TBR=avi@chromium.org Review URL: https://codereview.chromium.org/671663002 Cr-Commit-Position: refs/heads/master@{#300461}
Diffstat (limited to 'content/shell/browser/layout_test')
-rw-r--r--content/shell/browser/layout_test/layout_test_browser_context.h6
-rw-r--r--content/shell/browser/layout_test/layout_test_browser_main_parts.h6
-rw-r--r--content/shell/browser/layout_test/layout_test_content_browser_client.h18
-rw-r--r--content/shell/browser/layout_test/layout_test_devtools_frontend.h4
-rw-r--r--content/shell/browser/layout_test/layout_test_download_manager_delegate.h7
-rw-r--r--content/shell/browser/layout_test/layout_test_javascript_dialog_manager.h30
-rw-r--r--content/shell/browser/layout_test/layout_test_message_filter.h8
-rw-r--r--content/shell/browser/layout_test/layout_test_resource_dispatcher_host_delegate.h7
-rw-r--r--content/shell/browser/layout_test/layout_test_url_request_context_getter.h8
9 files changed, 46 insertions, 48 deletions
diff --git a/content/shell/browser/layout_test/layout_test_browser_context.h b/content/shell/browser/layout_test/layout_test_browser_context.h
index 3e0e999..fae095a 100644
--- a/content/shell/browser/layout_test/layout_test_browser_context.h
+++ b/content/shell/browser/layout_test/layout_test_browser_context.h
@@ -19,13 +19,13 @@ class DownloadManagerDelegate;
class LayoutTestBrowserContext : public ShellBrowserContext {
public:
LayoutTestBrowserContext(bool off_the_record, net::NetLog* net_log);
- virtual ~LayoutTestBrowserContext();
+ ~LayoutTestBrowserContext() override;
// BrowserContext implementation.
- virtual DownloadManagerDelegate* GetDownloadManagerDelegate() override;
+ DownloadManagerDelegate* GetDownloadManagerDelegate() override;
protected:
- virtual ShellURLRequestContextGetter* CreateURLRequestContextGetter(
+ ShellURLRequestContextGetter* CreateURLRequestContextGetter(
ProtocolHandlerMap* protocol_handlers,
URLRequestInterceptorScopedVector request_interceptors) override;
diff --git a/content/shell/browser/layout_test/layout_test_browser_main_parts.h b/content/shell/browser/layout_test/layout_test_browser_main_parts.h
index c73f829..ef3f857 100644
--- a/content/shell/browser/layout_test/layout_test_browser_main_parts.h
+++ b/content/shell/browser/layout_test/layout_test_browser_main_parts.h
@@ -30,11 +30,11 @@ class ShellPluginServiceFilter;
class LayoutTestBrowserMainParts : public ShellBrowserMainParts {
public:
explicit LayoutTestBrowserMainParts(const MainFunctionParams& parameters);
- virtual ~LayoutTestBrowserMainParts();
+ ~LayoutTestBrowserMainParts() override;
private:
- virtual void InitializeBrowserContexts() override;
- virtual void InitializeMessageLoopContext() override;
+ void InitializeBrowserContexts() override;
+ void InitializeMessageLoopContext() override;
#if defined(ENABLE_PLUGINS)
scoped_ptr<ShellPluginServiceFilter> plugin_service_filter_;
diff --git a/content/shell/browser/layout_test/layout_test_content_browser_client.h b/content/shell/browser/layout_test/layout_test_content_browser_client.h
index 0b8ea97..f58032a 100644
--- a/content/shell/browser/layout_test/layout_test_content_browser_client.h
+++ b/content/shell/browser/layout_test/layout_test_content_browser_client.h
@@ -17,23 +17,23 @@ class LayoutTestContentBrowserClient : public ShellContentBrowserClient {
static LayoutTestContentBrowserClient* Get();
LayoutTestContentBrowserClient();
- virtual ~LayoutTestContentBrowserClient();
+ ~LayoutTestContentBrowserClient() override;
// Will be lazily created when running layout tests.
LayoutTestNotificationManager* GetLayoutTestNotificationManager();
// ContentBrowserClient overrides.
- virtual void RenderProcessWillLaunch(RenderProcessHost* host) override;
- virtual void RequestDesktopNotificationPermission(
+ void RenderProcessWillLaunch(RenderProcessHost* host) override;
+ void RequestDesktopNotificationPermission(
const GURL& source_origin,
RenderFrameHost* render_frame_host,
const base::Callback<void(blink::WebNotificationPermission)>& callback)
- override;
- virtual blink::WebNotificationPermission
- CheckDesktopNotificationPermission(
- const GURL& source_url,
- ResourceContext* context,
- int render_process_id) override;
+ override;
+ blink::WebNotificationPermission CheckDesktopNotificationPermission(
+ const GURL& source_url,
+ ResourceContext* context,
+ int render_process_id) override;
+
private:
scoped_ptr<LayoutTestNotificationManager> layout_test_notification_manager_;
};
diff --git a/content/shell/browser/layout_test/layout_test_devtools_frontend.h b/content/shell/browser/layout_test/layout_test_devtools_frontend.h
index 3c6cb1c..5106a9b 100644
--- a/content/shell/browser/layout_test/layout_test_devtools_frontend.h
+++ b/content/shell/browser/layout_test/layout_test_devtools_frontend.h
@@ -27,10 +27,10 @@ class LayoutTestDevToolsFrontend : public ShellDevToolsFrontend {
private:
LayoutTestDevToolsFrontend(Shell* frontend_shell,
DevToolsAgentHost* agent_host);
- virtual ~LayoutTestDevToolsFrontend();
+ ~LayoutTestDevToolsFrontend() override;
// WebContentsObserver implementation.
- virtual void RenderProcessGone(base::TerminationStatus status) override;
+ void RenderProcessGone(base::TerminationStatus status) override;
DISALLOW_COPY_AND_ASSIGN(LayoutTestDevToolsFrontend);
};
diff --git a/content/shell/browser/layout_test/layout_test_download_manager_delegate.h b/content/shell/browser/layout_test/layout_test_download_manager_delegate.h
index dc18a21..eccc9f1 100644
--- a/content/shell/browser/layout_test/layout_test_download_manager_delegate.h
+++ b/content/shell/browser/layout_test/layout_test_download_manager_delegate.h
@@ -18,12 +18,11 @@ class DownloadItem;
class LayoutTestDownloadManagerDelegate : public ShellDownloadManagerDelegate {
public:
LayoutTestDownloadManagerDelegate();
- virtual ~LayoutTestDownloadManagerDelegate();
+ ~LayoutTestDownloadManagerDelegate() override;
// ShellDownloadManagerDelegate implementation.
- virtual bool ShouldOpenDownload(
- DownloadItem* item,
- const DownloadOpenDelayedCallback& callback) override;
+ bool ShouldOpenDownload(DownloadItem* item,
+ const DownloadOpenDelayedCallback& callback) override;
private:
DISALLOW_COPY_AND_ASSIGN(LayoutTestDownloadManagerDelegate);
diff --git a/content/shell/browser/layout_test/layout_test_javascript_dialog_manager.h b/content/shell/browser/layout_test/layout_test_javascript_dialog_manager.h
index 84ebace..87b56eb 100644
--- a/content/shell/browser/layout_test/layout_test_javascript_dialog_manager.h
+++ b/content/shell/browser/layout_test/layout_test_javascript_dialog_manager.h
@@ -15,24 +15,22 @@ namespace content {
class LayoutTestJavaScriptDialogManager : public ShellJavaScriptDialogManager {
public:
LayoutTestJavaScriptDialogManager();
- virtual ~LayoutTestJavaScriptDialogManager();
+ ~LayoutTestJavaScriptDialogManager() override;
// JavaScriptDialogManager:
- virtual void RunJavaScriptDialog(
- WebContents* web_contents,
- const GURL& origin_url,
- const std::string& accept_lang,
- JavaScriptMessageType javascript_message_type,
- const base::string16& message_text,
- const base::string16& default_prompt_text,
- const DialogClosedCallback& callback,
- bool* did_suppress_message) override;
-
- virtual void RunBeforeUnloadDialog(
- WebContents* web_contents,
- const base::string16& message_text,
- bool is_reload,
- const DialogClosedCallback& callback) override;
+ void RunJavaScriptDialog(WebContents* web_contents,
+ const GURL& origin_url,
+ const std::string& accept_lang,
+ JavaScriptMessageType javascript_message_type,
+ const base::string16& message_text,
+ const base::string16& default_prompt_text,
+ const DialogClosedCallback& callback,
+ bool* did_suppress_message) override;
+
+ void RunBeforeUnloadDialog(WebContents* web_contents,
+ const base::string16& message_text,
+ bool is_reload,
+ const DialogClosedCallback& callback) override;
private:
DISALLOW_COPY_AND_ASSIGN(LayoutTestJavaScriptDialogManager);
diff --git a/content/shell/browser/layout_test/layout_test_message_filter.h b/content/shell/browser/layout_test/layout_test_message_filter.h
index 95c875bc..044a4d2 100644
--- a/content/shell/browser/layout_test/layout_test_message_filter.h
+++ b/content/shell/browser/layout_test/layout_test_message_filter.h
@@ -36,12 +36,12 @@ class LayoutTestMessageFilter : public BrowserMessageFilter {
net::URLRequestContextGetter* request_context_getter);
private:
- virtual ~LayoutTestMessageFilter();
+ ~LayoutTestMessageFilter() override;
// BrowserMessageFilter implementation.
- virtual void OverrideThreadForMessage(const IPC::Message& message,
- BrowserThread::ID* thread) override;
- virtual bool OnMessageReceived(const IPC::Message& message) override;
+ void OverrideThreadForMessage(const IPC::Message& message,
+ BrowserThread::ID* thread) override;
+ bool OnMessageReceived(const IPC::Message& message) override;
void OnReadFileToString(const base::FilePath& local_file,
std::string* contents);
diff --git a/content/shell/browser/layout_test/layout_test_resource_dispatcher_host_delegate.h b/content/shell/browser/layout_test/layout_test_resource_dispatcher_host_delegate.h
index b5985c0..c8735a3 100644
--- a/content/shell/browser/layout_test/layout_test_resource_dispatcher_host_delegate.h
+++ b/content/shell/browser/layout_test/layout_test_resource_dispatcher_host_delegate.h
@@ -15,11 +15,12 @@ class LayoutTestResourceDispatcherHostDelegate
: public ShellResourceDispatcherHostDelegate {
public:
LayoutTestResourceDispatcherHostDelegate();
- virtual ~LayoutTestResourceDispatcherHostDelegate();
+ ~LayoutTestResourceDispatcherHostDelegate() override;
// ResourceDispatcherHostDelegate implementation.
- virtual ResourceDispatcherHostLoginDelegate* CreateLoginDelegate(
- net::AuthChallengeInfo* auth_info, net::URLRequest* request) override;
+ ResourceDispatcherHostLoginDelegate* CreateLoginDelegate(
+ net::AuthChallengeInfo* auth_info,
+ net::URLRequest* request) override;
private:
DISALLOW_COPY_AND_ASSIGN(LayoutTestResourceDispatcherHostDelegate);
diff --git a/content/shell/browser/layout_test/layout_test_url_request_context_getter.h b/content/shell/browser/layout_test/layout_test_url_request_context_getter.h
index 8b6233d..6ddf677 100644
--- a/content/shell/browser/layout_test/layout_test_url_request_context_getter.h
+++ b/content/shell/browser/layout_test/layout_test_url_request_context_getter.h
@@ -40,12 +40,12 @@ class LayoutTestURLRequestContextGetter : public ShellURLRequestContextGetter {
net::NetLog* net_log);
protected:
- virtual ~LayoutTestURLRequestContextGetter();
+ ~LayoutTestURLRequestContextGetter() override;
// ShellURLRequestContextGetter implementation.
- virtual net::NetworkDelegate* CreateNetworkDelegate() override;
- virtual net::ProxyConfigService* GetProxyConfigService() override;
- virtual net::ProxyService* GetProxyService() override;
+ net::NetworkDelegate* CreateNetworkDelegate() override;
+ net::ProxyConfigService* GetProxyConfigService() override;
+ net::ProxyService* GetProxyService() override;
private:
DISALLOW_COPY_AND_ASSIGN(LayoutTestURLRequestContextGetter);