summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/extensions/extension_debugger_api.cc3
-rw-r--r--chrome/browser/extensions/extension_devtools_bridge.cc9
-rw-r--r--content/browser/debugger/devtools_http_protocol_handler.cc3
-rw-r--r--content/common/devtools_messages.h3
-rw-r--r--content/renderer/devtools_agent.cc7
-rw-r--r--content/renderer/devtools_agent.h1
-rw-r--r--content/renderer/devtools_client.cc4
-rw-r--r--content/renderer/devtools_client.h1
-rw-r--r--webkit/tools/test_shell/test_shell_devtools_agent.cc13
-rw-r--r--webkit/tools/test_shell/test_shell_devtools_agent.h2
-rw-r--r--webkit/tools/test_shell/test_shell_devtools_client.cc5
-rw-r--r--webkit/tools/test_shell/test_shell_devtools_client.h1
12 files changed, 2 insertions, 50 deletions
diff --git a/chrome/browser/extensions/extension_debugger_api.cc b/chrome/browser/extensions/extension_debugger_api.cc
index d86f195..80d7970 100644
--- a/chrome/browser/extensions/extension_debugger_api.cc
+++ b/chrome/browser/extensions/extension_debugger_api.cc
@@ -133,9 +133,6 @@ ExtensionDevToolsClientHost::ExtensionDevToolsClientHost(
DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(
tab_contents_->render_view_host(),
this);
- DevToolsManager::GetInstance()->ForwardToDevToolsAgent(
- this,
- DevToolsAgentMsg_FrontendLoaded(MSG_ROUTING_NONE));
}
ExtensionDevToolsClientHost::~ExtensionDevToolsClientHost() {
diff --git a/chrome/browser/extensions/extension_devtools_bridge.cc b/chrome/browser/extensions/extension_devtools_bridge.cc
index 8bcc452..5372296 100644
--- a/chrome/browser/extensions/extension_devtools_bridge.cc
+++ b/chrome/browser/extensions/extension_devtools_bridge.cc
@@ -66,19 +66,14 @@ bool ExtensionDevToolsBridge::RegisterAsDevToolsClientHost() {
// Following messages depend on inspector protocol that is not yet
// finalized.
- // 1. Report front-end is loaded.
- devtools_manager->ForwardToDevToolsAgent(
- this,
- DevToolsAgentMsg_FrontendLoaded(MSG_ROUTING_NONE));
-
- // 2. Start timeline profiler.
+ // 1. Start timeline profiler.
devtools_manager->ForwardToDevToolsAgent(
this,
DevToolsAgentMsg_DispatchOnInspectorBackend(
MSG_ROUTING_NONE,
FormatDevToolsMessage(2, "Timeline.start")));
- // 3. Enable network resource tracking.
+ // 2. Enable network resource tracking.
devtools_manager->ForwardToDevToolsAgent(
this,
DevToolsAgentMsg_DispatchOnInspectorBackend(
diff --git a/content/browser/debugger/devtools_http_protocol_handler.cc b/content/browser/debugger/devtools_http_protocol_handler.cc
index 61b96e2..8771675 100644
--- a/content/browser/debugger/devtools_http_protocol_handler.cc
+++ b/content/browser/debugger/devtools_http_protocol_handler.cc
@@ -380,9 +380,6 @@ void DevToolsHttpProtocolHandler::OnWebSocketRequestUI(
manager->RegisterDevToolsClientHostFor(
tab_contents->render_view_host(),
client_host);
- manager->ForwardToDevToolsAgent(
- client_host,
- DevToolsAgentMsg_FrontendLoaded(MSG_ROUTING_NONE));
AcceptWebSocket(connection_id, request);
}
diff --git a/content/common/devtools_messages.h b/content/common/devtools_messages.h
index 3b261b6..36c88c0 100644
--- a/content/common/devtools_messages.h
+++ b/content/common/devtools_messages.h
@@ -70,9 +70,6 @@ IPC_MESSAGE_ROUTED1(DevToolsAgentMsg_Reattach,
// Tells agent that there is no longer a client host connected to it.
IPC_MESSAGE_ROUTED0(DevToolsAgentMsg_Detach)
-// Tells agent that the front-end has been loaded
-IPC_MESSAGE_ROUTED0(DevToolsAgentMsg_FrontendLoaded)
-
// WebKit-level transport.
IPC_MESSAGE_ROUTED1(DevToolsAgentMsg_DispatchOnInspectorBackend,
std::string /* message */)
diff --git a/content/renderer/devtools_agent.cc b/content/renderer/devtools_agent.cc
index ced97ba..093011c 100644
--- a/content/renderer/devtools_agent.cc
+++ b/content/renderer/devtools_agent.cc
@@ -77,7 +77,6 @@ bool DevToolsAgent::OnMessageReceived(const IPC::Message& message) {
IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Attach, OnAttach)
IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Reattach, OnReattach)
IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Detach, OnDetach)
- IPC_MESSAGE_HANDLER(DevToolsAgentMsg_FrontendLoaded, OnFrontendLoaded)
IPC_MESSAGE_HANDLER(DevToolsAgentMsg_DispatchOnInspectorBackend,
OnDispatchOnInspectorBackend)
IPC_MESSAGE_HANDLER(DevToolsAgentMsg_InspectElement, OnInspectElement)
@@ -154,12 +153,6 @@ void DevToolsAgent::OnDetach() {
}
}
-void DevToolsAgent::OnFrontendLoaded() {
- WebDevToolsAgent* web_agent = GetWebAgent();
- if (web_agent)
- web_agent->frontendLoaded();
-}
-
void DevToolsAgent::OnDispatchOnInspectorBackend(const std::string& message) {
WebDevToolsAgent* web_agent = GetWebAgent();
if (web_agent)
diff --git a/content/renderer/devtools_agent.h b/content/renderer/devtools_agent.h
index 50afe6a..847b9a0 100644
--- a/content/renderer/devtools_agent.h
+++ b/content/renderer/devtools_agent.h
@@ -54,7 +54,6 @@ class DevToolsAgent : public content::RenderViewObserver,
void OnAttach();
void OnReattach(const std::string& agent_state);
void OnDetach();
- void OnFrontendLoaded();
void OnDispatchOnInspectorBackend(const std::string& message);
void OnInspectElement(int x, int y);
void OnSetApuAgentEnabled(bool enabled);
diff --git a/content/renderer/devtools_client.cc b/content/renderer/devtools_client.cc
index c8b79d7..961c149 100644
--- a/content/renderer/devtools_client.cc
+++ b/content/renderer/devtools_client.cc
@@ -49,10 +49,6 @@ bool DevToolsClient::OnMessageReceived(const IPC::Message& message) {
return handled;
}
-void DevToolsClient::sendFrontendLoaded() {
- SendToAgent(DevToolsAgentMsg_FrontendLoaded(MSG_ROUTING_NONE));
-}
-
void DevToolsClient::sendMessageToBackend(const WebString& message) {
SendToAgent(DevToolsAgentMsg_DispatchOnInspectorBackend(MSG_ROUTING_NONE,
message.utf8()));
diff --git a/content/renderer/devtools_client.h b/content/renderer/devtools_client.h
index 8c7b47c..8dedfd6 100644
--- a/content/renderer/devtools_client.h
+++ b/content/renderer/devtools_client.h
@@ -37,7 +37,6 @@ class DevToolsClient : public content::RenderViewObserver,
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
// WebDevToolsFrontendClient implementation.
- virtual void sendFrontendLoaded() OVERRIDE;
virtual void sendMessageToBackend(const WebKit::WebString&) OVERRIDE;
virtual void activateWindow() OVERRIDE;
diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.cc b/webkit/tools/test_shell/test_shell_devtools_agent.cc
index 4604bfc..b2e4a95 100644
--- a/webkit/tools/test_shell/test_shell_devtools_agent.cc
+++ b/webkit/tools/test_shell/test_shell_devtools_agent.cc
@@ -93,12 +93,6 @@ void TestShellDevToolsAgent::Call(const TestShellDevToolsCallArgs &args) {
dev_tools_client_->all_messages_processed();
}
-void TestShellDevToolsAgent::DelayedFrontendLoaded() {
- WebDevToolsAgent *web_agent = GetWebAgent();
- if (web_agent)
- web_agent->frontendLoaded();
-}
-
WebDevToolsAgent* TestShellDevToolsAgent::GetWebAgent() {
if (!web_view_)
return NULL;
@@ -121,13 +115,6 @@ void TestShellDevToolsAgent::detach() {
dev_tools_client_ = NULL;
}
-void TestShellDevToolsAgent::frontendLoaded() {
- MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(&TestShellDevToolsAgent::DelayedFrontendLoaded,
- weak_factory_.GetWeakPtr()));
-}
-
bool TestShellDevToolsAgent::evaluateInWebInspector(
long call_id,
const std::string& script) {
diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.h b/webkit/tools/test_shell/test_shell_devtools_agent.h
index bf2dc97..826664d 100644
--- a/webkit/tools/test_shell/test_shell_devtools_agent.h
+++ b/webkit/tools/test_shell/test_shell_devtools_agent.h
@@ -43,13 +43,11 @@ class TestShellDevToolsAgent : public WebKit::WebDevToolsAgentClient {
void attach(TestShellDevToolsClient* client);
void detach();
- void frontendLoaded();
bool evaluateInWebInspector(long call_id, const std::string& script);
private:
void Call(const TestShellDevToolsCallArgs& args);
- void DelayedFrontendLoaded();
WebKit::WebDevToolsAgent* GetWebAgent();
base::WeakPtrFactory<TestShellDevToolsAgent> weak_factory_;
diff --git a/webkit/tools/test_shell/test_shell_devtools_client.cc b/webkit/tools/test_shell/test_shell_devtools_client.cc
index 5d34a2e..3834f96 100644
--- a/webkit/tools/test_shell/test_shell_devtools_client.cc
+++ b/webkit/tools/test_shell/test_shell_devtools_client.cc
@@ -42,11 +42,6 @@ TestShellDevToolsClient::~TestShellDevToolsClient() {
dev_tools_agent_->detach();
}
-void TestShellDevToolsClient::sendFrontendLoaded() {
- if (dev_tools_agent_)
- dev_tools_agent_->frontendLoaded();
-}
-
void TestShellDevToolsClient::sendMessageToBackend(
const WebString& data) {
if (dev_tools_agent_)
diff --git a/webkit/tools/test_shell/test_shell_devtools_client.h b/webkit/tools/test_shell/test_shell_devtools_client.h
index 6ee2024..42cf3f0 100644
--- a/webkit/tools/test_shell/test_shell_devtools_client.h
+++ b/webkit/tools/test_shell/test_shell_devtools_client.h
@@ -27,7 +27,6 @@ class TestShellDevToolsClient: public WebKit::WebDevToolsFrontendClient {
virtual ~TestShellDevToolsClient();
// WebDevToolsFrontendClient implementation
- virtual void sendFrontendLoaded();
virtual void sendMessageToBackend(const WebKit::WebString& data);
virtual void activateWindow();
generated by cgit v1.1 at 2025-02-01 05:28:02 +0000