Follow up to r93173: fixing check_deps and clang

Review URL: http://codereview.chromium.org/7453019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93176 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 9 insertions, 4 deletions

diff --git a/content/browser/debugger/DEPS b/content/browser/debugger/DEPS
index 973edd6..f7fc3b2 100644
--- a/content/browser/debugger/DEPS
+++ b/content/browser/debugger/DEPS
@@ -7,6 +7,7 @@ include_rules = [
 
   # http://crbug.com/84078
   "+chrome/browser/browser_process.h",
+  "+chrome/browser/debugger/devtools_window.h",
   "+chrome/browser/download/download_prefs.h",
   "+chrome/browser/extensions/extension_host.h",
   "+chrome/browser/extensions/extension_message_service.h",
diff --git a/content/browser/debugger/debugger_remote_service.cc b/content/browser/debugger/debugger_remote_service.cc
index 881c446..d42decc 100644
--- a/content/browser/debugger/debugger_remote_service.cc
+++ b/content/browser/debugger/debugger_remote_service.cc
@@ -252,7 +252,7 @@ void DebuggerRemoteService::DetachFromTab(const std::string& destination,
   DevToolsClientHostImpl* client_host =
       delegate_->inspectable_tab_proxy()->ClientHostForTabId(tab_uid);
   if (client_host != NULL) {
-    client_host->Close();
+    client_host->CloseImpl();
     result_code = RESULT_OK;
   } else {
     // No client host registered for |tab_uid|.
diff --git a/content/browser/debugger/devtools_client_host.cc b/content/browser/debugger/devtools_client_host.cc
index 0aaa40d..ef15e8b 100644
--- a/content/browser/debugger/devtools_client_host.cc
+++ b/content/browser/debugger/devtools_client_host.cc
@@ -35,6 +35,10 @@ DevToolsClientHost::~DevToolsClientHost() {
   instances_.erase(it);
 }
 
+RenderViewHost* DevToolsClientHost::GetClientRenderViewHost() {
+  return NULL;
+}
+
 DevToolsClientHost::DevToolsClientHost() : close_listener_(NULL) {
   instances_.push_back(this);
 }
diff --git a/content/browser/debugger/devtools_client_host.h b/content/browser/debugger/devtools_client_host.h
index 6372859..37de5cc 100644
--- a/content/browser/debugger/devtools_client_host.h
+++ b/content/browser/debugger/devtools_client_host.h
@@ -76,7 +76,7 @@ class DevToolsClientHost {
 
   // Returns client (front-end) RenderViewHost implementation of this
   // client host if applicable. NULL otherwise.
-  virtual RenderViewHost* GetClientRenderViewHost() { return NULL; }
+  virtual RenderViewHost* GetClientRenderViewHost();
 
  protected:
   DevToolsClientHost();
diff --git a/content/browser/debugger/inspectable_tab_proxy.cc b/content/browser/debugger/inspectable_tab_proxy.cc
index 9d06d7f..66511d8 100644
--- a/content/browser/debugger/inspectable_tab_proxy.cc
+++ b/content/browser/debugger/inspectable_tab_proxy.cc
@@ -35,7 +35,7 @@ void DevToolsClientHostImpl::InspectedTabClosing() {
 }
 
 // The remote debugger has detached.
-void DevToolsClientHostImpl::Close() {
+void DevToolsClientHostImpl::CloseImpl() {
   NotifyCloseListener();
   delete this;
 }
diff --git a/content/browser/debugger/inspectable_tab_proxy.h b/content/browser/debugger/inspectable_tab_proxy.h
index f42727e..0ccaf76 100644
--- a/content/browser/debugger/inspectable_tab_proxy.h
+++ b/content/browser/debugger/inspectable_tab_proxy.h
@@ -70,7 +70,7 @@ class DevToolsClientHostImpl : public DevToolsClientHost {
     return service_;
   }
 
-  void Close();
+  void CloseImpl();
 
   // DevToolsClientHost interface
   virtual void InspectedTabClosing();