summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-24 22:11:07 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-24 22:11:07 +0000
commit89ebc7edb982ebf5f8b185aa6e3aae6904eed965 (patch)
treeba32c69980b01c7c7d8d3f9d3cabebcb9ed88711 /chrome/common
parent5101c0073bf723b6e6bc81273264eaf7ac124937 (diff)
downloadchromium_src-89ebc7edb982ebf5f8b185aa6e3aae6904eed965.zip
chromium_src-89ebc7edb982ebf5f8b185aa6e3aae6904eed965.tar.gz
chromium_src-89ebc7edb982ebf5f8b185aa6e3aae6904eed965.tar.bz2
Exposes a chrome.devtools object to extensions. This allows extensions to call chrome.devtools.connect() to open up a Port by which it can receive devtools messages to implement the proposed perf trace extensions API documented here:
http://code.google.com/p/chromium/wiki/ExtensionsPerfTraceAPI Review URL: http://codereview.chromium.org/159882 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/chrome_switches.cc4
-rw-r--r--chrome/common/chrome_switches.h1
-rw-r--r--chrome/common/common_resources.grd2
-rwxr-xr-xchrome/common/extensions/api/extension_api.json23
4 files changed, 29 insertions, 1 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index a232be0..8fc249e 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -279,6 +279,10 @@ const wchar_t kDisableDevTools[] = L"disable-dev-tools";
// Allows us to use our dev tools to debug browser windows itself.
const wchar_t kAlwaysEnableDevTools[] = L"always-enable-dev-tools";
+// Enable experimental timeline API.
+const wchar_t kEnableExtensionTimelineApi[] =
+ L"enable-extension-timeline-api";
+
// Used to set the value of SessionRestore::num_tabs_to_load_. See
// session_restore.h for details.
const wchar_t kTabCountToLoadOnSessionRestore[] =
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index fce1b69..ef9a465 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -95,6 +95,7 @@ extern const wchar_t kAllowAllActiveX[];
extern const wchar_t kDisableDevTools[];
extern const wchar_t kAlwaysEnableDevTools[];
+extern const wchar_t kEnableExtensionTimelineApi[];
extern const wchar_t kTabCountToLoadOnSessionRestore[];
diff --git a/chrome/common/common_resources.grd b/chrome/common/common_resources.grd
index d9aae0d..9b7356c 100644
--- a/chrome/common/common_resources.grd
+++ b/chrome/common/common_resources.grd
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- This comment is only here because changes to resources are not picked up
-without changes to the corresponding grd file. rw4 -->
+without changes to the corresponding grd file. jr1 -->
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/common_resources.h" type="rc_header">
diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json
index 8f0c94d..2ea4962 100755
--- a/chrome/common/extensions/api/extension_api.json
+++ b/chrome/common/extensions/api/extension_api.json
@@ -865,6 +865,29 @@
"events": []
},
{
+ "namespace": "devtools",
+ "types": [
+ ],
+ "functions": [
+ {
+ "name": "getTabEvents",
+ "type": "function",
+ "description": "EXPERIMENTAL support for timeline API",
+ "nodocs": "true",
+ "parameters": [
+ {
+ "name": "tab_id",
+ "type": "integer"
+ }
+ ],
+ "returns": {
+ "type": "object",
+ "description": "DevTools tab events object"
+ }
+ }
+ ]
+ },
+ {
"namespace": "test",
"types": [],
"functions": [