summaryrefslogtreecommitdiffstats
path: root/content/renderer/devtools
diff options
context:
space:
mode:
authorcreis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-24 22:33:18 +0000
committercreis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-24 22:33:18 +0000
commitd142ccd2295cf9a67b5fb001d43ee0e9d01af45b (patch)
tree6fb23f37ce5b314b217359bd741f7fca749b6418 /content/renderer/devtools
parentde64b92b082ad3ac9af16e76fe9be0331a38a8a6 (diff)
downloadchromium_src-d142ccd2295cf9a67b5fb001d43ee0e9d01af45b.zip
chromium_src-d142ccd2295cf9a67b5fb001d43ee0e9d01af45b.tar.gz
chromium_src-d142ccd2295cf9a67b5fb001d43ee0e9d01af45b.tar.bz2
Revert 251563 "Move browser initiated navigation from RenderView..."
Speculatively revert to help diagnose bug 345757. Mainly useful to make it easier to revert r249676, which changes the lifetime of RenderViewHosts. > Move browser initiated navigation from RenderViewHost to RenderFrameHost. > > BUG=304341 > TBR=jochen@chromium.org > > Review URL: https://codereview.chromium.org/148083013 TBR=nasko@chromium.org Review URL: https://codereview.chromium.org/177713006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/devtools')
-rw-r--r--content/renderer/devtools/devtools_agent.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/content/renderer/devtools/devtools_agent.cc b/content/renderer/devtools/devtools_agent.cc
index 62eebbf..a241544 100644
--- a/content/renderer/devtools/devtools_agent.cc
+++ b/content/renderer/devtools/devtools_agent.cc
@@ -12,7 +12,6 @@
#include "base/process/process.h"
#include "base/strings/string_number_conversions.h"
#include "content/common/devtools_messages.h"
-#include "content/common/frame_messages.h"
#include "content/common/gpu/gpu_messages.h"
#include "content/common/view_messages.h"
#include "content/renderer/devtools/devtools_agent_filter.h"
@@ -106,7 +105,7 @@ bool DevToolsAgent::OnMessageReceived(const IPC::Message& message) {
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
- if (message.type() == FrameMsg_Navigate::ID ||
+ if (message.type() == ViewMsg_Navigate::ID ||
message.type() == ViewMsg_Close::ID)
ContinueProgram(); // Don't want to swallow the message.