Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(160)

Unified Diff: webkit/api/src/FrameLoaderClientImpl.cpp

Issue 342092: Eliminate WebViewImpl's dependency on WebDevToolsAgentImpl.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/api/public/WebViewClient.h ('k') | webkit/api/src/InspectorClientImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/api/src/FrameLoaderClientImpl.cpp
===================================================================
--- webkit/api/src/FrameLoaderClientImpl.cpp (revision 30797)
+++ webkit/api/src/FrameLoaderClientImpl.cpp (working copy)
@@ -63,6 +63,7 @@
#include "WebViewClient.h"
#include "WebViewImpl.h"
#include "WebDataSourceImpl.h"
+#include "WebDevToolsAgentPrivate.h"
#include "WebPluginContainerImpl.h"
#include "WebPluginLoadObserver.h"
#include "WindowFeatures.h"
@@ -71,7 +72,6 @@
// FIXME: remove these
#include "net/base/mime_util.h"
-#include "webkit/glue/webdevtoolsagent_impl.h"
using namespace WebCore;
@@ -113,11 +113,8 @@
m_webFrame->client()->didClearWindowObject(m_webFrame);
WebViewImpl* webview = m_webFrame->viewImpl();
- if (webview) {
- WebDevToolsAgentImpl* toolsAgent = webview->devToolsAgentImpl();
- if (toolsAgent)
- toolsAgent->WindowObjectCleared(m_webFrame);
- }
+ if (webview->devToolsAgentPrivate())
+ webview->devToolsAgentPrivate()->didClearWindowObject(m_webFrame);
}
void FrameLoaderClientImpl::documentElementAvailable()
@@ -653,9 +650,8 @@
if (m_webFrame->client())
m_webFrame->client()->didCommitProvisionalLoad(m_webFrame, isNewNavigation);
- WebDevToolsAgentImpl* toolsAgent = webview->devToolsAgentImpl();
- if (toolsAgent)
- toolsAgent->DidCommitLoadForFrame(webview, m_webFrame, isNewNavigation);
+ if (webview->devToolsAgentPrivate())
+ webview->devToolsAgentPrivate()->didCommitProvisionalLoad(m_webFrame, isNewNavigation);
}
void FrameLoaderClientImpl::dispatchDidFailProvisionalLoad(
« no previous file with comments | « webkit/api/public/WebViewClient.h ('k') | webkit/api/src/InspectorClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698