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 5b2dc0ebed34f6d8cafd79b76cf61211a0635657..e2e24b66352a5e148d25805c15ecd817cb489e68 100644 |
--- a/content/shell/browser/shell_devtools_delegate.cc |
+++ b/content/shell/browser/shell_devtools_delegate.cc |
@@ -55,7 +55,7 @@ class UnixDomainServerSocketFactory |
private: |
// content::DevToolsHttpHandler::ServerSocketFactory. |
- virtual scoped_ptr<net::ServerSocket> Create() const OVERRIDE { |
+ virtual scoped_ptr<net::ServerSocket> Create() const override { |
return scoped_ptr<net::ServerSocket>( |
new net::UnixDomainServerSocket( |
base::Bind(&content::CanUserConnectToDevTools), |
@@ -74,7 +74,7 @@ class TCPServerSocketFactory |
private: |
// content::DevToolsHttpHandler::ServerSocketFactory. |
- virtual scoped_ptr<net::ServerSocket> Create() const OVERRIDE { |
+ virtual 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 { |
+ 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 { |
switch (agent_host_->GetType()) { |
case DevToolsAgentHost::TYPE_WEB_CONTENTS: |
return kTargetTypePage; |
@@ -131,23 +131,23 @@ class Target : public content::DevToolsTarget { |
} |
return kTargetTypeOther; |
} |
- virtual std::string GetTitle() const OVERRIDE { |
+ 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 { |
+ 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 { |
return last_activity_time_; |
} |
- virtual bool IsAttached() const OVERRIDE { |
+ virtual bool IsAttached() const override { |
return agent_host_->IsAttached(); |
} |
- virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const OVERRIDE { |
+ virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const override { |
return agent_host_; |
} |
- virtual bool Activate() const OVERRIDE; |
- virtual bool Close() const OVERRIDE; |
+ virtual bool Activate() const override; |
+ virtual bool Close() const override; |
private: |
scoped_refptr<DevToolsAgentHost> agent_host_; |