| Index: chrome/browser/android/dev_tools_manager_delegate_android.cc
|
| diff --git a/chrome/browser/android/dev_tools_manager_delegate_android.cc b/chrome/browser/android/dev_tools_manager_delegate_android.cc
|
| index a5ea9279140dc0b3c190c746f1f437838e38c218..b7561ad6afeb2adb95a7ad0c7ea00b391c6a2252 100644
|
| --- a/chrome/browser/android/dev_tools_manager_delegate_android.cc
|
| +++ b/chrome/browser/android/dev_tools_manager_delegate_android.cc
|
| @@ -55,17 +55,17 @@ base::TimeTicks GetLastActiveTimeForAgentHost(
|
| class TargetBase : public content::DevToolsTarget {
|
| public:
|
| // content::DevToolsTarget implementation:
|
| - virtual std::string GetParentId() const override { return std::string(); }
|
| + std::string GetParentId() const override { return std::string(); }
|
|
|
| - virtual std::string GetTitle() const override { return title_; }
|
| + std::string GetTitle() const override { return title_; }
|
|
|
| - virtual std::string GetDescription() const override { return std::string(); }
|
| + std::string GetDescription() const override { return std::string(); }
|
|
|
| - virtual GURL GetURL() const override { return url_; }
|
| + GURL GetURL() const override { return url_; }
|
|
|
| - virtual GURL GetFaviconURL() const override { return favicon_url_; }
|
| + GURL GetFaviconURL() const override { return favicon_url_; }
|
|
|
| - virtual base::TimeTicks GetLastActivityTime() const override {
|
| + base::TimeTicks GetLastActivityTime() const override {
|
| return last_activity_time_;
|
| }
|
|
|
| @@ -110,15 +110,11 @@ class TabTarget : public TargetBase {
|
| }
|
|
|
| // content::DevToolsTarget implementation:
|
| - virtual std::string GetId() const override {
|
| - return base::IntToString(tab_id_);
|
| - }
|
| + std::string GetId() const override { return base::IntToString(tab_id_); }
|
|
|
| - virtual std::string GetType() const override {
|
| - return kTargetTypePage;
|
| - }
|
| + std::string GetType() const override { return kTargetTypePage; }
|
|
|
| - virtual bool IsAttached() const override {
|
| + bool IsAttached() const override {
|
| TabModel* model;
|
| int index;
|
| if (!FindTab(&model, &index))
|
| @@ -129,7 +125,7 @@ class TabTarget : public TargetBase {
|
| return DevToolsAgentHost::IsDebuggerAttached(web_contents);
|
| }
|
|
|
| - virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const override {
|
| + scoped_refptr<DevToolsAgentHost> GetAgentHost() const override {
|
| TabModel* model;
|
| int index;
|
| if (!FindTab(&model, &index))
|
| @@ -151,7 +147,7 @@ class TabTarget : public TargetBase {
|
| return DevToolsAgentHost::GetOrCreateFor(web_contents);
|
| }
|
|
|
| - virtual bool Activate() const override {
|
| + bool Activate() const override {
|
| TabModel* model;
|
| int index;
|
| if (!FindTab(&model, &index))
|
| @@ -160,7 +156,7 @@ class TabTarget : public TargetBase {
|
| return true;
|
| }
|
|
|
| - virtual bool Close() const override {
|
| + bool Close() const override {
|
| TabModel* model;
|
| int index;
|
| if (!FindTab(&model, &index))
|
| @@ -207,11 +203,9 @@ class NonTabTarget : public TargetBase {
|
| }
|
|
|
| // content::DevToolsTarget implementation:
|
| - virtual std::string GetId() const override {
|
| - return agent_host_->GetId();
|
| - }
|
| + std::string GetId() const override { return agent_host_->GetId(); }
|
|
|
| - virtual std::string GetType() const override {
|
| + std::string GetType() const override {
|
| switch (agent_host_->GetType()) {
|
| case DevToolsAgentHost::TYPE_WEB_CONTENTS:
|
| if (TabModelList::begin() == TabModelList::end()) {
|
| @@ -228,21 +222,15 @@ class NonTabTarget : public TargetBase {
|
| return kTargetTypeOther;
|
| }
|
|
|
| - virtual bool IsAttached() const override {
|
| - return agent_host_->IsAttached();
|
| - }
|
| + bool IsAttached() const override { return agent_host_->IsAttached(); }
|
|
|
| - virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const override {
|
| + scoped_refptr<DevToolsAgentHost> GetAgentHost() const override {
|
| return agent_host_;
|
| }
|
|
|
| - virtual bool Activate() const override {
|
| - return agent_host_->Activate();
|
| - }
|
| + bool Activate() const override { return agent_host_->Activate(); }
|
|
|
| - virtual bool Close() const override {
|
| - return agent_host_->Close();
|
| - }
|
| + bool Close() const override { return agent_host_->Close(); }
|
|
|
| private:
|
| scoped_refptr<DevToolsAgentHost> agent_host_;
|
|
|