| Index: content/browser/tab_contents/tab_contents.cc
|
| diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
|
| index d9effbc44f03af604b34ec7642086e50621a6ba9..6f2361f99cdf25bd755824cf3b1ece6138b64b10 100644
|
| --- a/content/browser/tab_contents/tab_contents.cc
|
| +++ b/content/browser/tab_contents/tab_contents.cc
|
| @@ -15,7 +15,7 @@
|
| #include "base/utf_string_conversions.h"
|
| #include "content/browser/browser_context.h"
|
| #include "content/browser/child_process_security_policy.h"
|
| -#include "content/browser/debugger/devtools_manager.h"
|
| +#include "content/browser/debugger/devtools_manager_impl.h"
|
| #include "content/browser/download/download_manager.h"
|
| #include "content/browser/download/download_stats.h"
|
| #include "content/browser/host_zoom_map.h"
|
| @@ -41,6 +41,7 @@
|
| #include "content/common/intents_messages.h"
|
| #include "content/common/view_messages.h"
|
| #include "content/public/browser/content_browser_client.h"
|
| +#include "content/public/browser/devtools/devtools_agent_host_registry.h"
|
| #include "content/public/browser/navigation_types.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/common/bindings_policy.h"
|
| @@ -100,6 +101,10 @@
|
| // the user goes back. The process only stays live if another tab is using
|
| // it, but if so, the existing frame relationships will be maintained.
|
|
|
| +using content::DevToolsAgentHost;
|
| +using content::DevToolsAgentHostRegistry;
|
| +using content::DevToolsManagerImpl;
|
| +
|
| namespace {
|
|
|
| // Amount of time we wait between when a key event is received and the renderer
|
| @@ -608,12 +613,10 @@ bool TabContents::NavigateToEntry(
|
| is_allowed_in_web_ui_renderer);
|
|
|
| // Tell DevTools agent that it is attached prior to the navigation.
|
| - DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
|
| - if (devtools_manager) { // NULL in unit tests.
|
| - devtools_manager->OnNavigatingToPendingEntry(render_view_host(),
|
| - dest_render_view_host,
|
| - entry.url());
|
| - }
|
| + DevToolsManagerImpl::GetInstance()->OnNavigatingToPendingEntry(
|
| + render_view_host(),
|
| + dest_render_view_host,
|
| + entry.url());
|
|
|
| // Used for page load time metrics.
|
| current_load_start_ = base::TimeTicks::Now();
|
| @@ -1877,9 +1880,10 @@ void TabContents::RendererUnresponsive(RenderViewHost* rvh,
|
| // Ignore renderer unresponsive event if debugger is attached to the tab
|
| // since the event may be a result of the renderer sitting on a breakpoint.
|
| // See http://crbug.com/65458
|
| - DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
|
| - if (devtools_manager &&
|
| - devtools_manager->GetDevToolsClientHostFor(rvh) != NULL)
|
| + DevToolsAgentHost* agent =
|
| + content::DevToolsAgentHostRegistry::GetDevToolsAgentHost(rvh);
|
| + if (agent &&
|
| + DevToolsManagerImpl::GetInstance()->GetDevToolsClientHostFor(agent))
|
| return;
|
|
|
| if (is_during_unload) {
|
|
|