| Index: third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp
|
| index deb83a37f672a48e401c08599fdf9fbccdf91712..13dc4c95f3a590a654ff5aa9ca86c11aa18dba41 100644
|
| --- a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp
|
| @@ -48,7 +48,6 @@
|
| #include "core/inspector/InspectorLayerTreeAgent.h"
|
| #include "core/inspector/InspectorLogAgent.h"
|
| #include "core/inspector/InspectorMemoryAgent.h"
|
| -#include "core/inspector/InspectorNetworkAgent.h"
|
| #include "core/inspector/InspectorPageAgent.h"
|
| #include "core/inspector/InspectorResourceContainer.h"
|
| #include "core/inspector/InspectorResourceContentLoader.h"
|
| @@ -388,7 +387,7 @@ void WebDevToolsAgentImpl::initializeSession(int sessionId, const String& hostId
|
| m_layerTreeAgent = layerTreeAgent;
|
| m_session->append(layerTreeAgent);
|
|
|
| - InspectorNetworkAgent* networkAgent = InspectorNetworkAgent::create(m_inspectedFrames.get());
|
| + InspectorNetworkAgent* networkAgent = InspectorNetworkAgent::create(this, m_inspectedFrames.get());
|
| m_networkAgent = networkAgent;
|
| m_session->append(networkAgent);
|
|
|
| @@ -501,6 +500,8 @@ void WebDevToolsAgentImpl::didStartProvisionalLoad(LocalFrame* frame)
|
| {
|
| if (m_session && m_inspectedFrames->root() == frame)
|
| m_session->v8Session()->resume();
|
| + if (m_networkAgent)
|
| + m_networkAgent->didStartProvisionalLoad();
|
| }
|
|
|
| bool WebDevToolsAgentImpl::screencastEnabled()
|
| @@ -563,6 +564,12 @@ void WebDevToolsAgentImpl::setCPUThrottlingRate(double rate)
|
| m_client->setCPUThrottlingRate(rate);
|
| }
|
|
|
| +void WebDevToolsAgentImpl::showCertificateViewer(const Vector<AtomicString>& certificate)
|
| +{
|
| + if (m_client)
|
| + m_client->showCertificateViewer(WebVector<WebString>(certificate));
|
| +}
|
| +
|
| void WebDevToolsAgentImpl::dispatchOnInspectorBackend(int sessionId, int callId, const WebString& method, const WebString& message)
|
| {
|
| if (!attached())
|
|
|