| Index: android_webview/browser/aw_dev_tools_manager_delegate.cc
|
| diff --git a/android_webview/browser/aw_dev_tools_manager_delegate.cc b/android_webview/browser/aw_dev_tools_manager_delegate.cc
|
| index 6e9f0ce0fa47cea0646ca71496991ff273932990..8cc3ce84526436c26f6201df29f27e9a02e0891e 100644
|
| --- a/android_webview/browser/aw_dev_tools_manager_delegate.cc
|
| +++ b/android_webview/browser/aw_dev_tools_manager_delegate.cc
|
| @@ -30,9 +30,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;
|
| @@ -43,23 +43,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 description_; }
|
| - virtual GURL GetURL() const OVERRIDE { return agent_host_->GetURL(); }
|
| - virtual GURL GetFaviconURL() const OVERRIDE { return GURL(); }
|
| - virtual base::TimeTicks GetLastActivityTime() const OVERRIDE {
|
| + virtual std::string GetDescription() const override { return description_; }
|
| + virtual GURL GetURL() const override { return agent_host_->GetURL(); }
|
| + virtual GURL GetFaviconURL() const override { return GURL(); }
|
| + 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 { return agent_host_->Activate(); }
|
| - virtual bool Close() const OVERRIDE { return agent_host_->Close(); }
|
| + virtual bool Activate() const override { return agent_host_->Activate(); }
|
| + virtual bool Close() const override { return agent_host_->Close(); }
|
|
|
| private:
|
| scoped_refptr<DevToolsAgentHost> agent_host_;
|
|
|