Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2252)

Unified Diff: content/shell/browser/shell_devtools_delegate.cc

Issue 671663002: Standardize usage of virtual/override/final in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/browser/shell_devtools_delegate.h ('k') | content/shell/browser/shell_devtools_frontend.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/shell_devtools_delegate.cc
diff --git a/content/shell/browser/shell_devtools_delegate.cc b/content/shell/browser/shell_devtools_delegate.cc
index e2e24b66352a5e148d25805c15ecd817cb489e68..6ee0e709da51333584ce9c212d20cbda6c8ea2b6 100644
--- a/content/shell/browser/shell_devtools_delegate.cc
+++ b/content/shell/browser/shell_devtools_delegate.cc
@@ -74,7 +74,7 @@ class TCPServerSocketFactory
private:
// content::DevToolsHttpHandler::ServerSocketFactory.
- virtual scoped_ptr<net::ServerSocket> Create() const override {
+ scoped_ptr<net::ServerSocket> Create() const override {
return scoped_ptr<net::ServerSocket>(
new net::TCPServerSocket(NULL, net::NetLog::Source()));
}
@@ -118,9 +118,9 @@ class Target : public content::DevToolsTarget {
public:
explicit Target(scoped_refptr<DevToolsAgentHost> agent_host);
- virtual std::string GetId() const override { return agent_host_->GetId(); }
- virtual std::string GetParentId() const override { return std::string(); }
- virtual std::string GetType() const override {
+ std::string GetId() const override { return agent_host_->GetId(); }
+ std::string GetParentId() const override { return std::string(); }
+ std::string GetType() const override {
switch (agent_host_->GetType()) {
case DevToolsAgentHost::TYPE_WEB_CONTENTS:
return kTargetTypePage;
@@ -131,23 +131,19 @@ class Target : public content::DevToolsTarget {
}
return kTargetTypeOther;
}
- virtual std::string GetTitle() const override {
- return agent_host_->GetTitle();
- }
- virtual std::string GetDescription() const override { return std::string(); }
- virtual GURL GetURL() const override { return agent_host_->GetURL(); }
- virtual GURL GetFaviconURL() const override { return favicon_url_; }
- virtual base::TimeTicks GetLastActivityTime() const override {
+ std::string GetTitle() const override { return agent_host_->GetTitle(); }
+ std::string GetDescription() const override { return std::string(); }
+ GURL GetURL() const override { return agent_host_->GetURL(); }
+ GURL GetFaviconURL() const override { return favicon_url_; }
+ base::TimeTicks GetLastActivityTime() const override {
return last_activity_time_;
}
- virtual bool IsAttached() const override {
- return agent_host_->IsAttached();
- }
- virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const override {
+ bool IsAttached() const override { return agent_host_->IsAttached(); }
+ scoped_refptr<DevToolsAgentHost> GetAgentHost() const override {
return agent_host_;
}
- virtual bool Activate() const override;
- virtual bool Close() const override;
+ bool Activate() const override;
+ bool Close() const override;
private:
scoped_refptr<DevToolsAgentHost> agent_host_;
« no previous file with comments | « content/shell/browser/shell_devtools_delegate.h ('k') | content/shell/browser/shell_devtools_frontend.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698