summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-12 23:57:18 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-12 23:57:18 +0000
commit2f7f4d591192cfdebee227b72e3cf57c7c604450 (patch)
tree181fc0fc257b6203c3ca2affb33f4b143de5fd3c /chrome/renderer
parent5a8459aa45b09a6cdcdd90ca190ba353799e3464 (diff)
downloadchromium_src-2f7f4d591192cfdebee227b72e3cf57c7c604450.zip
chromium_src-2f7f4d591192cfdebee227b72e3cf57c7c604450.tar.gz
chromium_src-2f7f4d591192cfdebee227b72e3cf57c7c604450.tar.bz2
Enables the sending of Timeline Agent and Resource messages to the devtools api in extensions.
Review URL: http://codereview.chromium.org/267013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28761 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/devtools_agent.cc9
-rw-r--r--chrome/renderer/devtools_agent.h1
-rw-r--r--chrome/renderer/resources/extension_process_bindings.js2
3 files changed, 11 insertions, 1 deletions
diff --git a/chrome/renderer/devtools_agent.cc b/chrome/renderer/devtools_agent.cc
index 74af788..aa6baad3 100644
--- a/chrome/renderer/devtools_agent.cc
+++ b/chrome/renderer/devtools_agent.cc
@@ -37,6 +37,8 @@ bool DevToolsAgent::OnMessageReceived(const IPC::Message& message) {
IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Detach, OnDetach)
IPC_MESSAGE_HANDLER(DevToolsAgentMsg_RpcMessage, OnRpcMessage)
IPC_MESSAGE_HANDLER(DevToolsAgentMsg_InspectElement, OnInspectElement)
+ IPC_MESSAGE_HANDLER(DevToolsAgentMsg_SetApuAgentEnabled,
+ OnSetApuAgentEnabled)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
return handled;
@@ -106,6 +108,13 @@ void DevToolsAgent::OnInspectElement(int x, int y) {
}
}
+void DevToolsAgent::OnSetApuAgentEnabled(bool enabled) {
+ WebDevToolsAgent* web_agent = GetWebAgent();
+ if (web_agent) {
+ web_agent->SetApuAgentEnabled(enabled);
+ }
+}
+
WebDevToolsAgent* DevToolsAgent::GetWebAgent() {
WebView* web_view = view_->webview();
if (!web_view)
diff --git a/chrome/renderer/devtools_agent.h b/chrome/renderer/devtools_agent.h
index 25906ae..6cd5d97 100644
--- a/chrome/renderer/devtools_agent.h
+++ b/chrome/renderer/devtools_agent.h
@@ -58,6 +58,7 @@ class DevToolsAgent : public WebDevToolsAgentDelegate {
const std::string& param2,
const std::string& param3);
void OnInspectElement(int x, int y);
+ void OnSetApuAgentEnabled(bool enabled);
static std::map<int, DevToolsAgent*> agent_for_routing_id_;
diff --git a/chrome/renderer/resources/extension_process_bindings.js b/chrome/renderer/resources/extension_process_bindings.js
index 0ac0be4..3f6c267 100644
--- a/chrome/renderer/resources/extension_process_bindings.js
+++ b/chrome/renderer/resources/extension_process_bindings.js
@@ -316,7 +316,7 @@ var chrome = chrome || {};
apiFunctions["devtools.getTabEvents"].handleRequest = function(tabId) {
var tabIdProxy = {};
- var functions = ["onPageEvent", "onTabUrlChange", "onTabClose"];
+ var functions = ["onPageEvent", "onTabClose"];
functions.forEach(function(name) {
// Event disambiguation is handled by name munging. See
// chrome/browser/extensions/extension_devtools_events.h for the C++