diff options
25 files changed, 99 insertions, 121 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 1350747..63cfea8 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4054,7 +4054,7 @@ Update checks have repeatedly failed for the extension "<ph name="EXTENSION_NAME Your tabs and browsing activity </message> <message name="IDS_EXTENSION_PROMPT_WARNING_DEBUGGER" desc="Permission string for access to debugger."> - Your data on all websites + Page debugger backend </message> <message name="IDS_EXTENSION_PROMPT_WARNING_CLIPBOARD" desc="Permission string for access to clipboard."> Data you copy and paste diff --git a/chrome/browser/extensions/extension_debugger_api.h b/chrome/browser/extensions/extension_debugger_api.h index 531e0e7..d50e743 100644 --- a/chrome/browser/extensions/extension_debugger_api.h +++ b/chrome/browser/extensions/extension_debugger_api.h @@ -41,7 +41,7 @@ class AttachDebuggerFunction : public DebuggerFunction { AttachDebuggerFunction(); virtual ~AttachDebuggerFunction(); virtual bool RunImpl() OVERRIDE; - DECLARE_EXTENSION_FUNCTION_NAME("experimental.debugger.attach") + DECLARE_EXTENSION_FUNCTION_NAME("debugger.attach") }; // Implements the debugger.detach() extension function. @@ -50,7 +50,7 @@ class DetachDebuggerFunction : public DebuggerFunction { DetachDebuggerFunction(); virtual ~DetachDebuggerFunction(); virtual bool RunImpl() OVERRIDE; - DECLARE_EXTENSION_FUNCTION_NAME("experimental.debugger.detach") + DECLARE_EXTENSION_FUNCTION_NAME("debugger.detach") }; // Implements the debugger.sendCommand() extension function. @@ -61,7 +61,7 @@ class SendCommandDebuggerFunction : public DebuggerFunction { virtual bool RunImpl() OVERRIDE; void SendResponseBody(base::DictionaryValue* dictionary); - DECLARE_EXTENSION_FUNCTION_NAME("experimental.debugger.sendCommand") + DECLARE_EXTENSION_FUNCTION_NAME("debugger.sendCommand") }; #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_DEBUGGER_API_H_ diff --git a/chrome/browser/extensions/extension_debugger_api_constants.cc b/chrome/browser/extensions/extension_debugger_api_constants.cc index c34ba6f..973096f 100644 --- a/chrome/browser/extensions/extension_debugger_api_constants.cc +++ b/chrome/browser/extensions/extension_debugger_api_constants.cc @@ -11,8 +11,8 @@ const char kDataKey[] = "data"; const char kTabIdKey[] = "tabId"; const char kVersionIdKey[] = "requiredVersion"; -const char kOnEvent[] = "experimental.debugger.onEvent"; -const char kOnDetach[] = "experimental.debugger.onDetach"; +const char kOnEvent[] = "debugger.onEvent"; +const char kOnDetach[] = "debugger.onDetach"; const char kAlreadyAttachedError[] = "Another debugger is already attached to the tab with id: *."; diff --git a/chrome/browser/extensions/extension_debugger_apitest.cc b/chrome/browser/extensions/extension_debugger_apitest.cc index ec7c9cd..25ddbe3 100644 --- a/chrome/browser/extensions/extension_debugger_apitest.cc +++ b/chrome/browser/extensions/extension_debugger_apitest.cc @@ -7,8 +7,5 @@ #include "chrome/common/chrome_switches.h" IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Debugger) { - CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(RunExtensionTest("debugger")) << message_; } diff --git a/chrome/common/common_resources.grd b/chrome/common/common_resources.grd index 1e8a0dd..610e1efa 100644 --- a/chrome/common/common_resources.grd +++ b/chrome/common/common_resources.grd @@ -17,12 +17,12 @@ <include name="IDR_EXTENSION_API_JSON_CONTENTSETTINGS" file="extensions\api\contentSettings.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_CONTEXTMENUS" file="extensions\api\contextMenus.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_COOKIES" file="extensions\api\cookies.json" type="BINDATA" /> + <include name="IDR_EXTENSION_API_JSON_DEBUGGER" file="extensions\api\debugger.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_DEVTOOLS" file="extensions\api\devtools.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_ACCESSIBILITY" file="extensions\api\experimental.accessibility.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_APP" file="extensions\api\experimental.app.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_BOOKMARKMANAGER" file="extensions\api\experimental.bookmarkManager.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_CLEAR" file="extensions\api\experimental.clear.json" type="BINDATA" /> - <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_DEBUGGER" file="extensions\api\experimental.debugger.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_DOWNLOADS" file="extensions\api\experimental.downloads.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INFOBARS" file="extensions\api\experimental.infobars.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_IME" file="extensions\api\experimental.input.ime.json" type="BINDATA" /> diff --git a/chrome/common/extensions/api/experimental.debugger.json b/chrome/common/extensions/api/debugger.json index 54bcbe7..ce08874 100644 --- a/chrome/common/extensions/api/experimental.debugger.json +++ b/chrome/common/extensions/api/debugger.json @@ -1,6 +1,6 @@ [ { - "namespace": "experimental.debugger", + "namespace": "debugger", "types": [ { "id": "Debuggee", diff --git a/chrome/common/extensions/api/extension_api.cc b/chrome/common/extensions/api/extension_api.cc index d906279..1d61f9b 100644 --- a/chrome/common/extensions/api/extension_api.cc +++ b/chrome/common/extensions/api/extension_api.cc @@ -62,12 +62,12 @@ ExtensionAPI::ExtensionAPI() { IDR_EXTENSION_API_JSON_CONTENTSETTINGS, IDR_EXTENSION_API_JSON_CONTEXTMENUS, IDR_EXTENSION_API_JSON_COOKIES, + IDR_EXTENSION_API_JSON_DEBUGGER, IDR_EXTENSION_API_JSON_DEVTOOLS, IDR_EXTENSION_API_JSON_EXPERIMENTAL_ACCESSIBILITY, IDR_EXTENSION_API_JSON_EXPERIMENTAL_APP, IDR_EXTENSION_API_JSON_EXPERIMENTAL_BOOKMARKMANAGER, IDR_EXTENSION_API_JSON_EXPERIMENTAL_CLEAR, - IDR_EXTENSION_API_JSON_EXPERIMENTAL_DEBUGGER, IDR_EXTENSION_API_JSON_EXPERIMENTAL_DOWNLOADS, IDR_EXTENSION_API_JSON_EXPERIMENTAL_INFOBARS, IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_IME, diff --git a/chrome/common/extensions/docs/api_index.html b/chrome/common/extensions/docs/api_index.html index e4b757c..2938a14 100644 --- a/chrome/common/extensions/docs/api_index.html +++ b/chrome/common/extensions/docs/api_index.html @@ -357,7 +357,7 @@ Here are the supported chrome.* APIs: </p> <ul> - <li><a href="bookmarks.html" js="">bookmarks</a></li><li><a href="browserAction.html" js="">browserAction</a></li><li><a href="contentSettings.html" js="">contentSettings</a></li><li><a href="contextMenus.html" js="">contextMenus</a></li><li><a href="cookies.html" js="">cookies</a></li><li><a href="extension.html" js="">extension</a></li><li><a href="fileBrowserHandler.html" js="">fileBrowserHandler</a></li><li><a href="history.html" js="">history</a></li><li><a href="i18n.html" js="">i18n</a></li><li><a href="idle.html" js="">idle</a></li><li><a href="management.html" js="">management</a></li><li><a href="omnibox.html" js="">omnibox</a></li><li><a href="pageAction.html" js="">pageAction</a></li><li><a href="pageCapture.html" js="">pageCapture</a></li><li><a href="permissions.html" js="">permissions</a></li><li><a href="proxy.html" js="">proxy</a></li><li><a href="tabs.html" js="">tabs</a></li><li><a href="tts.html" js="">tts</a></li><li><a href="ttsEngine.html" js="">ttsEngine</a></li><li><a href="types.html" js="">types</a></li><li><a href="webNavigation.html" js="">webNavigation</a></li><li><a href="webRequest.html" js="">webRequest</a></li><li><a href="windows.html" js="">windows</a></li> + <li><a href="bookmarks.html" js="">bookmarks</a></li><li><a href="browserAction.html" js="">browserAction</a></li><li><a href="contentSettings.html" js="">contentSettings</a></li><li><a href="contextMenus.html" js="">contextMenus</a></li><li><a href="cookies.html" js="">cookies</a></li><li><a href="debugger.html" js="">debugger</a></li><li><a href="extension.html" js="">extension</a></li><li><a href="fileBrowserHandler.html" js="">fileBrowserHandler</a></li><li><a href="history.html" js="">history</a></li><li><a href="i18n.html" js="">i18n</a></li><li><a href="idle.html" js="">idle</a></li><li><a href="management.html" js="">management</a></li><li><a href="omnibox.html" js="">omnibox</a></li><li><a href="pageAction.html" js="">pageAction</a></li><li><a href="pageCapture.html" js="">pageCapture</a></li><li><a href="permissions.html" js="">permissions</a></li><li><a href="proxy.html" js="">proxy</a></li><li><a href="tabs.html" js="">tabs</a></li><li><a href="tts.html" js="">tts</a></li><li><a href="ttsEngine.html" js="">ttsEngine</a></li><li><a href="types.html" js="">types</a></li><li><a href="webNavigation.html" js="">webNavigation</a></li><li><a href="webRequest.html" js="">webRequest</a></li><li><a href="windows.html" js="">windows</a></li> </ul> <h2 id="experimental">Experimental APIs</h2> diff --git a/chrome/common/extensions/docs/experimental.debugger.html b/chrome/common/extensions/docs/debugger.html index 5f1cdae..443300a 100644 --- a/chrome/common/extensions/docs/experimental.debugger.html +++ b/chrome/common/extensions/docs/debugger.html @@ -16,7 +16,7 @@ <script type="text/javascript" src="js/api_page_generator.js"></script> <script type="text/javascript" src="js/bootstrap.js"></script> <script type="text/javascript" src="js/sidebar.js"></script> - <meta name="description" content="Documentation for the chrome.experimental.debugger module, which is part of the Google Chrome extension APIs."><title>chrome.experimental.debugger - Google Chrome Extensions - Google Code</title></head> + <meta name="description" content="Documentation for the chrome.debugger module, which is part of the Google Chrome extension APIs."><title>chrome.debugger - Google Chrome Extensions - Google Code</title></head> <body> <div id="gc-container" class="labs"> <div id="devModeWarning"> You are viewing extension docs in chrome via the 'file:' scheme: are you expecting to see local changes when you refresh? You'll need run chrome with --allow-file-access-from-files. @@ -294,7 +294,7 @@ <div class="g-unit" id="gc-pagecontent"> <div id="pageTitle"> - <h1 class="page_title">chrome.experimental.debugger</h1> + <h1 class="page_title">chrome.debugger</h1> </div> <!-- TABLE OF CONTENTS --> <div id="toc"> @@ -323,7 +323,7 @@ </ol> </li> <li> - <a href="#apiReference">API reference: chrome.experimental.debugger</a> + <a href="#apiReference">API reference: chrome.debugger</a> <ol> <li style="display: none; "> <a href="#properties">Properties</a> @@ -388,7 +388,7 @@ <!-- /TABLE OF CONTENTS --> <!-- Standard content lead-in for experimental API pages --> - <p id="classSummary"> + <p id="classSummary" style="display: none; "> For information on how to use experimental APIs, see the <a href="experimental.html">chrome.experimental.* APIs</a> page. </p> @@ -400,7 +400,7 @@ <p> Debugger API serves as an alternate transport for Chrome's <a href="http://code.google.com/chrome/devtools/docs/remote-debugging.html"> -remote debugging protocol</a>. Use <code>chrome.experimental.debugger</code> +remote debugging protocol</a>. Use <code>chrome.debugger</code> to attach to one or more tabs to instrument network interaction, debug JavaScript, mutate the DOM and CSS, etc. Use the Debuggee tabId to target tabs with sendCommand and route events by <code>tabId</code> from onEvent callbacks. @@ -417,8 +417,7 @@ debugging session is terminated. Extension can re-establish it later. <p> You must declare the "debugger" permission in your extension's manifest -to use this API. The debugger API is currently experimental, so you must -declare the "experimental" permission to use it as well. +to use this API. </p> <pre>{ @@ -426,7 +425,6 @@ declare the "experimental" permission to use it as well. ... <b> "permissions": [ "debugger", - "experimental" ]</b>, ... }</pre> @@ -445,7 +443,7 @@ You can find samples of this API in <!-- API PAGE --> <div class="apiPage"> <a name="apiReference"></a> - <h2>API reference: chrome.experimental.debugger</h2> + <h2>API reference: chrome.debugger</h2> <!-- PROPERTIES --> <div class="apiGroup" style="display: none; "> @@ -477,7 +475,7 @@ You can find samples of this API in <div class="summary"><span style="display: none; ">void</span> <!-- Note: intentionally longer 80 columns --> - <span>chrome.experimental.debugger.attach</span>(<span class="null"><span style="display: none; ">, </span><span>Debuggee</span> + <span>chrome.debugger.attach</span>(<span class="null"><span style="display: none; ">, </span><span>Debuggee</span> <var><span>target</span></var></span><span class="null"><span>, </span><span>string</span> <var><span>requiredVersion</span></var></span><span class="optional"><span>, </span><span>function</span> <var><span>callback</span></var></span>)</div> @@ -502,7 +500,7 @@ You can find samples of this API in <span class="enum" style="display: none; ">enumerated</span> <span id="typeTemplate"> <span> - <a href="experimental.debugger.html#type-Debuggee">Debuggee</a> + <a href="debugger.html#type-Debuggee">Debuggee</a> </span> <span style="display: none; "> <span> @@ -744,7 +742,7 @@ You can find samples of this API in <div class="summary"><span style="display: none; ">void</span> <!-- Note: intentionally longer 80 columns --> - <span>chrome.experimental.debugger.detach</span>(<span class="null"><span style="display: none; ">, </span><span>Debuggee</span> + <span>chrome.debugger.detach</span>(<span class="null"><span style="display: none; ">, </span><span>Debuggee</span> <var><span>target</span></var></span><span class="optional"><span>, </span><span>function</span> <var><span>callback</span></var></span>)</div> @@ -768,7 +766,7 @@ You can find samples of this API in <span class="enum" style="display: none; ">enumerated</span> <span id="typeTemplate"> <span> - <a href="experimental.debugger.html#type-Debuggee">Debuggee</a> + <a href="debugger.html#type-Debuggee">Debuggee</a> </span> <span style="display: none; "> <span> @@ -942,7 +940,7 @@ You can find samples of this API in <div class="summary"><span style="display: none; ">void</span> <!-- Note: intentionally longer 80 columns --> - <span>chrome.experimental.debugger.sendCommand</span>(<span class="null"><span style="display: none; ">, </span><span>Debuggee</span> + <span>chrome.debugger.sendCommand</span>(<span class="null"><span style="display: none; ">, </span><span>Debuggee</span> <var><span>target</span></var></span><span class="null"><span>, </span><span>string</span> <var><span>method</span></var></span><span class="optional"><span>, </span><span>object</span> <var><span>params</span></var></span><span class="optional"><span>, </span><span>function</span> @@ -968,7 +966,7 @@ You can find samples of this API in <span class="enum" style="display: none; ">enumerated</span> <span id="typeTemplate"> <span> - <a href="experimental.debugger.html#type-Debuggee">Debuggee</a> + <a href="debugger.html#type-Debuggee">Debuggee</a> </span> <span style="display: none; "> <span> @@ -1352,7 +1350,7 @@ You can find samples of this API in <div class="summary"> <!-- Note: intentionally longer 80 columns --> - <span class="subdued">chrome.experimental.debugger.</span><span>onDetach</span><span class="subdued">.addListener</span>(function(<span>Debuggee source</span>) <span class="subdued">{...}</span><span></span>); + <span class="subdued">chrome.debugger.</span><span>onDetach</span><span class="subdued">.addListener</span>(function(<span>Debuggee source</span>) <span class="subdued">{...}</span><span></span>); </div> <div class="description"> @@ -1376,7 +1374,7 @@ You can find samples of this API in <span class="enum" style="display: none; ">enumerated</span> <span id="typeTemplate"> <span> - <a href="experimental.debugger.html#type-Debuggee">Debuggee</a> + <a href="debugger.html#type-Debuggee">Debuggee</a> </span> <span style="display: none; "> <span> @@ -1462,7 +1460,7 @@ You can find samples of this API in <div class="summary"> <!-- Note: intentionally longer 80 columns --> - <span class="subdued">chrome.experimental.debugger.</span><span>onEvent</span><span class="subdued">.addListener</span>(function(<span>Debuggee source, string method, object params</span>) <span class="subdued">{...}</span><span></span>); + <span class="subdued">chrome.debugger.</span><span>onEvent</span><span class="subdued">.addListener</span>(function(<span>Debuggee source, string method, object params</span>) <span class="subdued">{...}</span><span></span>); </div> <div class="description"> @@ -1486,7 +1484,7 @@ You can find samples of this API in <span class="enum" style="display: none; ">enumerated</span> <span id="typeTemplate"> <span> - <a href="experimental.debugger.html#type-Debuggee">Debuggee</a> + <a href="debugger.html#type-Debuggee">Debuggee</a> </span> <span style="display: none; "> <span> diff --git a/chrome/common/extensions/docs/examples/api/debugger/live-headers.zip b/chrome/common/extensions/docs/examples/api/debugger/live-headers.zip Binary files differindex 7a6f31f..627a440 100644 --- a/chrome/common/extensions/docs/examples/api/debugger/live-headers.zip +++ b/chrome/common/extensions/docs/examples/api/debugger/live-headers.zip diff --git a/chrome/common/extensions/docs/examples/api/debugger/live-headers/background.html b/chrome/common/extensions/docs/examples/api/debugger/live-headers/background.html index 612032d1..860a1bb 100644 --- a/chrome/common/extensions/docs/examples/api/debugger/live-headers/background.html +++ b/chrome/common/extensions/docs/examples/api/debugger/live-headers/background.html @@ -16,7 +16,7 @@ chrome.browserAction.onClicked.addListener(function() { var version = "0.1"; function actionClicked(tab) { - chrome.experimental.debugger.attach({tabId:tab.id}, version, onAttach.bind(null, tab.id)); + chrome.debugger.attach({tabId:tab.id}, version, onAttach.bind(null, tab.id)); } function onAttach(tabId) { diff --git a/chrome/common/extensions/docs/examples/api/debugger/live-headers/headers.html b/chrome/common/extensions/docs/examples/api/debugger/live-headers/headers.html index 8fa1bb8..6261c3e 100644 --- a/chrome/common/extensions/docs/examples/api/debugger/live-headers/headers.html +++ b/chrome/common/extensions/docs/examples/api/debugger/live-headers/headers.html @@ -28,12 +28,12 @@ body { var tabId = parseInt(window.location.search.substring(1)); window.addEventListener("load", function() { - chrome.experimental.debugger.sendCommand({tabId:tabId}, "Network.enable"); - chrome.experimental.debugger.onEvent.addListener(onEvent); + chrome.debugger.sendCommand({tabId:tabId}, "Network.enable"); + chrome.debugger.onEvent.addListener(onEvent); }); window.addEventListener("unload", function() { - chrome.experimental.debugger.detach({tabId:tabId}); + chrome.debugger.detach({tabId:tabId}); }); var requests = {}; diff --git a/chrome/common/extensions/docs/examples/api/debugger/live-headers/manifest.json b/chrome/common/extensions/docs/examples/api/debugger/live-headers/manifest.json index e83e6964..a5689ec54 100644 --- a/chrome/common/extensions/docs/examples/api/debugger/live-headers/manifest.json +++ b/chrome/common/extensions/docs/examples/api/debugger/live-headers/manifest.json @@ -4,9 +4,7 @@ "version": "0.5", "permissions": [ "tabs", - "debugger", - "experimental", - "http://*/*" + "debugger" ], "background_page": "background.html", "browser_action": { diff --git a/chrome/common/extensions/docs/examples/api/debugger/pause-resume.zip b/chrome/common/extensions/docs/examples/api/debugger/pause-resume.zip Binary files differindex 7790f4f..272b9bc 100644 --- a/chrome/common/extensions/docs/examples/api/debugger/pause-resume.zip +++ b/chrome/common/extensions/docs/examples/api/debugger/pause-resume.zip diff --git a/chrome/common/extensions/docs/examples/api/debugger/pause-resume/background.html b/chrome/common/extensions/docs/examples/api/debugger/pause-resume/background.html index 7b98632..b07b628 100644 --- a/chrome/common/extensions/docs/examples/api/debugger/pause-resume/background.html +++ b/chrome/common/extensions/docs/examples/api/debugger/pause-resume/background.html @@ -11,8 +11,8 @@ found in the LICENSE file. var attachedTabs = {}; var version = "0.1"; -chrome.experimental.debugger.onEvent.addListener(onEvent); -chrome.experimental.debugger.onDetach.addListener(onDetach); +chrome.debugger.onEvent.addListener(onEvent); +chrome.debugger.onDetach.addListener(onDetach); chrome.browserAction.onClicked.addListener(function() { chrome.windows.getCurrent(function(win) { @@ -28,9 +28,9 @@ function actionClicked(tab) { return; if (!attachedTabs[tabId]) - chrome.experimental.debugger.attach(debuggeeId, version, onAttach.bind(null, debuggeeId)); + chrome.debugger.attach(debuggeeId, version, onAttach.bind(null, debuggeeId)); else if (attachedTabs[tabId]) - chrome.experimental.debugger.detach(debuggeeId, onDetach.bind(null, debuggeeId)); + chrome.debugger.detach(debuggeeId, onDetach.bind(null, debuggeeId)); } function onAttach(debuggeeId) { @@ -43,13 +43,13 @@ function onAttach(debuggeeId) { chrome.browserAction.setIcon({tabId: tabId, path:"debuggerPausing.png"}); chrome.browserAction.setTitle({tabId: tabId, title:"Pausing JavaScript"}); attachedTabs[tabId] = "pausing"; - chrome.experimental.debugger.sendCommand( + chrome.debugger.sendCommand( debuggeeId, "Debugger.enable", {}, onDebuggerEnabled.bind(null, debuggeeId)); } function onDebuggerEnabled(debuggeeId) { - chrome.experimental.debugger.sendCommand(debuggeeId, "Debugger.pause"); + chrome.debugger.sendCommand(debuggeeId, "Debugger.pause"); } function onEvent(debuggeeId, method) { diff --git a/chrome/common/extensions/docs/examples/api/debugger/pause-resume/manifest.json b/chrome/common/extensions/docs/examples/api/debugger/pause-resume/manifest.json index 236e0f1..4d35ed5 100644 --- a/chrome/common/extensions/docs/examples/api/debugger/pause-resume/manifest.json +++ b/chrome/common/extensions/docs/examples/api/debugger/pause-resume/manifest.json @@ -4,9 +4,7 @@ "version": "0.5", "permissions": [ "tabs", - "debugger", - "experimental", - "http://*/*" + "debugger" ], "background_page": "background.html", "browser_action": { diff --git a/chrome/common/extensions/docs/experimental.html b/chrome/common/extensions/docs/experimental.html index 60cee65..0ef8064 100644 --- a/chrome/common/extensions/docs/experimental.html +++ b/chrome/common/extensions/docs/experimental.html @@ -377,7 +377,6 @@ on the following experimental APIs: <li> <a href="experimental.app.html">experimental.app</a></li><li> <a href="experimental.clear.html">experimental.clear</a></li><li> - <a href="experimental.debugger.html">experimental.debugger</a></li><li> <a href="experimental.devtools.audits.html">experimental.devtools.audits</a></li><li> <a href="experimental.devtools.console.html">experimental.devtools.console</a></li><li> <a href="experimental.devtools.inspectedWindow.html">experimental.devtools.inspectedWindow</a></li><li> diff --git a/chrome/common/extensions/docs/js/api_page_generator.js b/chrome/common/extensions/docs/js/api_page_generator.js index eea58c0..4589828 100644 --- a/chrome/common/extensions/docs/js/api_page_generator.js +++ b/chrome/common/extensions/docs/js/api_page_generator.js @@ -28,12 +28,12 @@ var MODULE_SCHEMAS = [ '../api/contentSettings.json', '../api/contextMenus.json', '../api/cookies.json', + '../api/debugger.json', '../api/devtools.json', '../api/experimental.accessibility.json', '../api/experimental.app.json', '../api/experimental.bookmarkManager.json', '../api/experimental.clear.json', - '../api/experimental.debugger.json', '../api/experimental.downloads.json', '../api/experimental.infobars.json', '../api/experimental.input.ime.json', diff --git a/chrome/common/extensions/docs/samples.html b/chrome/common/extensions/docs/samples.html index f6a98ee..0d88ab0 100644 --- a/chrome/common/extensions/docs/samples.html +++ b/chrome/common/extensions/docs/samples.html @@ -360,9 +360,9 @@ "2020d72f2577f53caf8e94e3dbac0fb849ceaa4d": "IDLE - SIMPLE EXAMPLE DEMONSTRATES THE IDLE API BACKGROUND_PAGE BROWSER_ACTION IDLE CHROME.BROWSERACTION.ONCLICKED CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.IDLE.ONSTATECHANGED CHROME.IDLE.QUERYSTATE", "0ea1588bd07b20338fc21f725de1542a5fdf9726": "IGOOGLE NEW TAB PAGE CHROME_URL_OVERRIDES", "646325c25f572a1d15edc73d057f821d847a4fbe": "IMAGEINFO GET IMAGE INFO FOR IMAGES, INCLUDING EXIF DATA BACKGROUND_PAGE CONTEXTMENUS TABS CHROME.CONTEXTMENUS.CREATE CHROME.TABS.GET CHROME.TABS.GETCURRENT CHROME.WINDOWS.CREATE CHROME.WINDOWS.UPDATE", - "8f52a8a59c6fc16cb0d1ed0680b7f005be033d58": "JAVASCRIPT PAUSE/RESUME PAUSES / RESUMES JAVASCRIPT EXECUTION BACKGROUND_PAGE BROWSER_ACTION DEBUGGER EXPERIMENTAL TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETICON CHROME.BROWSERACTION.SETTITLE CHROME.EXPERIMENTAL.DEBUGGER.ATTACH CHROME.EXPERIMENTAL.DEBUGGER.DETACH CHROME.EXPERIMENTAL.DEBUGGER.ONDETACH CHROME.EXPERIMENTAL.DEBUGGER.ONEVENT CHROME.EXPERIMENTAL.DEBUGGER.SENDCOMMAND CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.WINDOWS.GET CHROME.WINDOWS.GETCURRENT", + "8f52a8a59c6fc16cb0d1ed0680b7f005be033d58": "JAVASCRIPT PAUSE/RESUME PAUSES / RESUMES JAVASCRIPT EXECUTION BACKGROUND_PAGE BROWSER_ACTION DEBUGGER TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETICON CHROME.BROWSERACTION.SETTITLE CHROME.DEBUGGER.ATTACH CHROME.DEBUGGER.DETACH CHROME.DEBUGGER.ONDETACH CHROME.DEBUGGER.ONEVENT CHROME.DEBUGGER.SENDCOMMAND CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.WINDOWS.GET CHROME.WINDOWS.GETCURRENT", "65b2fe595b7ac38dddd89cca50f5efd0017b0bd4": "KEYBOARD PIN CREATES A KEYBOARD SHORTCUT (C + SHIFT + P) TO TOGGLE THE PINNED STATE OF THE CURRENTLY SELECTED TAB BACKGROUND_PAGE TABS CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.TABS.UPDATE", - "cc8563a6666add797264184a960c7b7c8bd3e64d": "LIVE HTTP HEADERS DISPLAYS THE LIVE LOG WITH THE HTTP REQUESTS HEADERS BACKGROUND_PAGE BROWSER_ACTION DEBUGGER EXPERIMENTAL TABS CHROME.BROWSERACTION.ONCLICKED CHROME.EXPERIMENTAL.DEBUGGER.ATTACH CHROME.EXPERIMENTAL.DEBUGGER.DETACH CHROME.EXPERIMENTAL.DEBUGGER.ONEVENT CHROME.EXPERIMENTAL.DEBUGGER.SENDCOMMAND CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.WINDOWS.CREATE CHROME.WINDOWS.GET CHROME.WINDOWS.GETCURRENT", + "cc8563a6666add797264184a960c7b7c8bd3e64d": "LIVE HTTP HEADERS DISPLAYS THE LIVE LOG WITH THE HTTP REQUESTS HEADERS BACKGROUND_PAGE BROWSER_ACTION DEBUGGER TABS CHROME.BROWSERACTION.ONCLICKED CHROME.DEBUGGER.ATTACH CHROME.DEBUGGER.DETACH CHROME.DEBUGGER.ONEVENT CHROME.DEBUGGER.SENDCOMMAND CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.WINDOWS.CREATE CHROME.WINDOWS.GET CHROME.WINDOWS.GETCURRENT", "ec97ec20ca2f095d081e39f1565fc12af09ef067": "MAPPY FINDS ADDRESSES IN THE WEB PAGE YOURE ON AND POPS UP A MAP WINDOW. BACKGROUND_PAGE PAGE_ACTION POPUP TABS CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.EXTENSION.ONREQUEST CHROME.PAGEACTION.HIDE CHROME.PAGEACTION.SETTITLE CHROME.PAGEACTION.SHOW CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.TABS.ONSELECTIONCHANGED CHROME.TABS.ONUPDATED CHROME.TABS.SENDREQUEST", "b2f5f8a790e16f091a7e4e0a39b2d0a6d32e3a6d": "MERGE WINDOWS MERGES ALL OF THE BROWSERS WINDOWS INTO THE CURRENT WINDOW BACKGROUND_PAGE BROWSER_ACTION TABS CHROME.BROWSERACTION.ONCLICKED CHROME.TABS.GET CHROME.TABS.GETALLINWINDOW CHROME.TABS.MOVE CHROME.WINDOWS.GET CHROME.WINDOWS.GETALL CHROME.WINDOWS.GETCURRENT", "51a83d2ba3a32e3ff1bdb624d4e18ccec4c4038e": "MESSAGE TIMER TIMES HOW LONG IT TAKES TO SEND A MESSAGE TO A CONTENT SCRIPT AND BACK. BROWSER_ACTION POPUP TABS CHROME.EXTENSION.ONCONNECT CHROME.EXTENSION.ONREQUEST CHROME.TABS.CONNECT CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.TABS.SENDREQUEST", @@ -422,6 +422,8 @@ </span><span> <a href="javascript:void(0);" onclick="setFilter('chrome.cookies', this)">chrome.cookies</a><span>, </span> </span><span> + <a href="javascript:void(0);" onclick="setFilter('chrome.debugger', this)">chrome.debugger</a><span>, </span> + </span><span> <a href="javascript:void(0);" onclick="setFilter('chrome.experimental', this)">chrome.experimental</a><span>, </span> </span><span> <a href="javascript:void(0);" onclick="setFilter('chrome.extension', this)">chrome.extension</a><span>, </span> @@ -2326,10 +2328,7 @@ <strong>browser_action</strong><span>, </span> <span style="display: none; "> and</span> </span><span> - <strong>debugger</strong><span>, </span> - <span style="display: none; "> and</span> - </span><span> - <strong>experimental</strong><span style="display: none; ">, </span> + <strong>debugger</strong><span style="display: none; ">, </span> <span> and</span> </span><span> <strong>tabs</strong><span style="display: none; ">, </span> @@ -2346,15 +2345,15 @@ </li><li> <code><a href="browserAction.html#method-setTitle">chrome.browserAction.setTitle</a></code> </li><li> - <code><a href="experimental.debugger.html#method-attach">chrome.experimental.debugger.attach</a></code> + <code><a href="debugger.html#method-attach">chrome.debugger.attach</a></code> </li><li> - <code><a href="experimental.debugger.html#method-detach">chrome.experimental.debugger.detach</a></code> + <code><a href="debugger.html#method-detach">chrome.debugger.detach</a></code> </li><li> - <code><a href="experimental.debugger.html#event-onDetach">chrome.experimental.debugger.onDetach</a></code> + <code><a href="debugger.html#event-onDetach">chrome.debugger.onDetach</a></code> </li><li> - <code><a href="experimental.debugger.html#event-onEvent">chrome.experimental.debugger.onEvent</a></code> + <code><a href="debugger.html#event-onEvent">chrome.debugger.onEvent</a></code> </li><li> - <code><a href="experimental.debugger.html#method-sendCommand">chrome.experimental.debugger.sendCommand</a></code> + <code><a href="debugger.html#method-sendCommand">chrome.debugger.sendCommand</a></code> </li><li> <code><a href="tabs.html#method-get">chrome.tabs.get</a></code> </li><li> @@ -2447,10 +2446,7 @@ <strong>browser_action</strong><span>, </span> <span style="display: none; "> and</span> </span><span> - <strong>debugger</strong><span>, </span> - <span style="display: none; "> and</span> - </span><span> - <strong>experimental</strong><span style="display: none; ">, </span> + <strong>debugger</strong><span style="display: none; ">, </span> <span> and</span> </span><span> <strong>tabs</strong><span style="display: none; ">, </span> @@ -2463,13 +2459,13 @@ <li> <code><a href="browserAction.html#event-onClicked">chrome.browserAction.onClicked</a></code> </li><li> - <code><a href="experimental.debugger.html#method-attach">chrome.experimental.debugger.attach</a></code> + <code><a href="debugger.html#method-attach">chrome.debugger.attach</a></code> </li><li> - <code><a href="experimental.debugger.html#method-detach">chrome.experimental.debugger.detach</a></code> + <code><a href="debugger.html#method-detach">chrome.debugger.detach</a></code> </li><li> - <code><a href="experimental.debugger.html#event-onEvent">chrome.experimental.debugger.onEvent</a></code> + <code><a href="debugger.html#event-onEvent">chrome.debugger.onEvent</a></code> </li><li> - <code><a href="experimental.debugger.html#method-sendCommand">chrome.experimental.debugger.sendCommand</a></code> + <code><a href="debugger.html#method-sendCommand">chrome.debugger.sendCommand</a></code> </li><li> <code><a href="tabs.html#method-get">chrome.tabs.get</a></code> </li><li> @@ -2497,8 +2493,8 @@ <div> <a href="examples/api/debugger/live-headers.zip">Download source</a> <!-- Only show the Install CRX link if a CRX file is provided --> - <span style="display: none; "> - - <a>Install extension</a> + <span> + - <a href="examples/api/debugger/live-headers.crx">Install extension</a> </span> </div> </div><div class="sample" id="ec97ec20ca2f095d081e39f1565fc12af09ef067"> diff --git a/chrome/common/extensions/docs/samples.json b/chrome/common/extensions/docs/samples.json index c64e8fb..f64e3c1 100644 --- a/chrome/common/extensions/docs/samples.json +++ b/chrome/common/extensions/docs/samples.json @@ -36,6 +36,11 @@ "chrome.cookies.onChanged": "cookies.html#event-onChanged", "chrome.cookies.remove": "cookies.html#method-remove", "chrome.cookies.set": "cookies.html#method-set", + "chrome.debugger.attach": "debugger.html#method-attach", + "chrome.debugger.detach": "debugger.html#method-detach", + "chrome.debugger.onDetach": "debugger.html#event-onDetach", + "chrome.debugger.onEvent": "debugger.html#event-onEvent", + "chrome.debugger.sendCommand": "debugger.html#method-sendCommand", "chrome.experimental.app.clearAllNotifications": "experimental.app.html#method-clearAllNotifications", "chrome.experimental.app.notify": "experimental.app.html#method-notify", "chrome.experimental.app.resetLaunchIcon": "experimental.app.html#method-resetLaunchIcon", @@ -53,11 +58,6 @@ "chrome.experimental.clear.lsoData": "experimental.clear.html#method-lsoData", "chrome.experimental.clear.passwords": "experimental.clear.html#method-passwords", "chrome.experimental.clear.webSQL": "experimental.clear.html#method-webSQL", - "chrome.experimental.debugger.attach": "experimental.debugger.html#method-attach", - "chrome.experimental.debugger.detach": "experimental.debugger.html#method-detach", - "chrome.experimental.debugger.onDetach": "experimental.debugger.html#event-onDetach", - "chrome.experimental.debugger.onEvent": "experimental.debugger.html#event-onEvent", - "chrome.experimental.debugger.sendCommand": "experimental.debugger.html#method-sendCommand", "chrome.experimental.devtools.audits.addCategory": "experimental.devtools.audits.html#method-addCategory", "chrome.experimental.devtools.console.addMessage": "experimental.devtools.console.html#method-addMessage", "chrome.experimental.devtools.console.getMessages": "experimental.devtools.console.html#method-getMessages", @@ -1277,11 +1277,11 @@ "chrome.browserAction.onClicked", "chrome.browserAction.setIcon", "chrome.browserAction.setTitle", - "chrome.experimental.debugger.attach", - "chrome.experimental.debugger.detach", - "chrome.experimental.debugger.onDetach", - "chrome.experimental.debugger.onEvent", - "chrome.experimental.debugger.sendCommand", + "chrome.debugger.attach", + "chrome.debugger.detach", + "chrome.debugger.onDetach", + "chrome.debugger.onEvent", + "chrome.debugger.sendCommand", "chrome.tabs.get", "chrome.tabs.getSelected", "chrome.windows.get", @@ -1293,7 +1293,6 @@ "background_page", "browser_action", "debugger", - "experimental", "tabs" ], "icon": null, @@ -1301,15 +1300,13 @@ "name": "JavaScript pause\/resume", "packaged_app": false, "path": "examples\/api\/debugger\/pause-resume\/", - "protocols": [ - "http:\/\/" - ], - "search_string": "JAVASCRIPT PAUSE\/RESUME PAUSES \/ RESUMES JAVASCRIPT EXECUTION BACKGROUND_PAGE BROWSER_ACTION DEBUGGER EXPERIMENTAL TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETICON CHROME.BROWSERACTION.SETTITLE CHROME.EXPERIMENTAL.DEBUGGER.ATTACH CHROME.EXPERIMENTAL.DEBUGGER.DETACH CHROME.EXPERIMENTAL.DEBUGGER.ONDETACH CHROME.EXPERIMENTAL.DEBUGGER.ONEVENT CHROME.EXPERIMENTAL.DEBUGGER.SENDCOMMAND CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.WINDOWS.GET CHROME.WINDOWS.GETCURRENT", + "protocols": [], + "search_string": "JAVASCRIPT PAUSE\/RESUME PAUSES \/ RESUMES JAVASCRIPT EXECUTION BACKGROUND_PAGE BROWSER_ACTION DEBUGGER TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETICON CHROME.BROWSERACTION.SETTITLE CHROME.DEBUGGER.ATTACH CHROME.DEBUGGER.DETACH CHROME.DEBUGGER.ONDETACH CHROME.DEBUGGER.ONEVENT CHROME.DEBUGGER.SENDCOMMAND CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.WINDOWS.GET CHROME.WINDOWS.GETCURRENT", "source_files": [ "background.html", "manifest.json" ], - "source_hash": "1451d74f3201ea8248e36e691892da2d83ac1d7a", + "source_hash": "0c12ec083c6920140d0f4df19bd6bf06efbb3b7c", "zip_path": "examples\/api\/debugger\/pause-resume.zip" }, { @@ -1344,23 +1341,22 @@ { "api_calls": [ "chrome.browserAction.onClicked", - "chrome.experimental.debugger.attach", - "chrome.experimental.debugger.detach", - "chrome.experimental.debugger.onEvent", - "chrome.experimental.debugger.sendCommand", + "chrome.debugger.attach", + "chrome.debugger.detach", + "chrome.debugger.onEvent", + "chrome.debugger.sendCommand", "chrome.tabs.get", "chrome.tabs.getSelected", "chrome.windows.create", "chrome.windows.get", "chrome.windows.getCurrent" ], - "crx_path": null, + "crx_path": "examples\/api\/debugger\/live-headers.crx", "description": "Displays the live log with the http requests headers", "features": [ "background_page", "browser_action", "debugger", - "experimental", "tabs" ], "icon": null, @@ -1368,16 +1364,14 @@ "name": "Live HTTP headers", "packaged_app": false, "path": "examples\/api\/debugger\/live-headers\/", - "protocols": [ - "http:\/\/" - ], - "search_string": "LIVE HTTP HEADERS DISPLAYS THE LIVE LOG WITH THE HTTP REQUESTS HEADERS BACKGROUND_PAGE BROWSER_ACTION DEBUGGER EXPERIMENTAL TABS CHROME.BROWSERACTION.ONCLICKED CHROME.EXPERIMENTAL.DEBUGGER.ATTACH CHROME.EXPERIMENTAL.DEBUGGER.DETACH CHROME.EXPERIMENTAL.DEBUGGER.ONEVENT CHROME.EXPERIMENTAL.DEBUGGER.SENDCOMMAND CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.WINDOWS.CREATE CHROME.WINDOWS.GET CHROME.WINDOWS.GETCURRENT", + "protocols": [], + "search_string": "LIVE HTTP HEADERS DISPLAYS THE LIVE LOG WITH THE HTTP REQUESTS HEADERS BACKGROUND_PAGE BROWSER_ACTION DEBUGGER TABS CHROME.BROWSERACTION.ONCLICKED CHROME.DEBUGGER.ATTACH CHROME.DEBUGGER.DETACH CHROME.DEBUGGER.ONEVENT CHROME.DEBUGGER.SENDCOMMAND CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.WINDOWS.CREATE CHROME.WINDOWS.GET CHROME.WINDOWS.GETCURRENT", "source_files": [ "background.html", "headers.html", "manifest.json" ], - "source_hash": "e27257a1987bc368490e1aeead33a85e72e16ed9", + "source_hash": "9eb4cf01a17e1b1e519a47b4ee9a0bee04d02efd", "zip_path": "examples\/api\/debugger\/live-headers.zip" }, { diff --git a/chrome/common/extensions/docs/static/experimental.debugger.html b/chrome/common/extensions/docs/static/debugger.html index 4a3c142..433d2a0 100644 --- a/chrome/common/extensions/docs/static/experimental.debugger.html +++ b/chrome/common/extensions/docs/static/debugger.html @@ -5,7 +5,7 @@ <p> Debugger API serves as an alternate transport for Chrome's <a href="http://code.google.com/chrome/devtools/docs/remote-debugging.html"> -remote debugging protocol</a>. Use <code>chrome.experimental.debugger</code> +remote debugging protocol</a>. Use <code>chrome.debugger</code> to attach to one or more tabs to instrument network interaction, debug JavaScript, mutate the DOM and CSS, etc. Use the Debuggee tabId to target tabs with sendCommand and route events by <code>tabId</code> from onEvent callbacks. @@ -22,8 +22,7 @@ debugging session is terminated. Extension can re-establish it later. <p> You must declare the "debugger" permission in your extension's manifest -to use this API. The debugger API is currently experimental, so you must -declare the "experimental" permission to use it as well. +to use this API. </p> <pre>{ @@ -31,7 +30,6 @@ declare the "experimental" permission to use it as well. ... <b> "permissions": [ "debugger", - "experimental" ]</b>, ... }</pre> diff --git a/chrome/common/extensions/extension_permission_set.cc b/chrome/common/extensions/extension_permission_set.cc index bc5127d..3cadb1e 100644 --- a/chrome/common/extensions/extension_permission_set.cc +++ b/chrome/common/extensions/extension_permission_set.cc @@ -232,10 +232,6 @@ void ExtensionAPIPermission::RegisterAllPermissions( ExtensionPermissionMessage::kNone, kFlagSupportsOptional, kTypeDefault - kTypePlatformApp); info->RegisterPermission( - kDebugger, "debugger", IDS_EXTENSION_PROMPT_WARNING_DEBUGGER, - ExtensionPermissionMessage::kDebugger, - kFlagSupportsOptional, kTypeDefault); - info->RegisterPermission( kFileBrowserHandler, "fileBrowserHandler", 0, ExtensionPermissionMessage::kNone, kFlagNone, kTypeDefault); info->RegisterPermission( @@ -315,6 +311,11 @@ void ExtensionAPIPermission::RegisterAllPermissions( kFlagImpliesFullURLAccess, kTypeDefault); info->RegisterPermission( + kDebugger, "debugger", IDS_EXTENSION_PROMPT_WARNING_DEBUGGER, + ExtensionPermissionMessage::kDebugger, + kFlagImpliesFullURLAccess, kTypeDefault); + + info->RegisterPermission( kDevtools, "devtools", 0, ExtensionPermissionMessage::kNone, kFlagImpliesFullURLAccess, kTypeDefault); diff --git a/chrome/test/data/extensions/api_test/debugger/background.js b/chrome/test/data/extensions/api_test/debugger/background.js index d0a8516..fda4f98 100644 --- a/chrome/test/data/extensions/api_test/debugger/background.js +++ b/chrome/test/data/extensions/api_test/debugger/background.js @@ -13,14 +13,14 @@ chrome.test.runTests([ function attachMalformedVersion() { chrome.tabs.getSelected(null, function(tab) { - chrome.experimental.debugger.attach({tabId: tab.id}, "malformed-version", + chrome.debugger.attach({tabId: tab.id}, "malformed-version", fail("Requested protocol version is not supported: malformed-version.")); }); }, function attachUnsupportedVersion() { chrome.tabs.getSelected(null, function(tab) { - chrome.experimental.debugger.attach({tabId: tab.id}, "1.0", + chrome.debugger.attach({tabId: tab.id}, "1.0", fail("Requested protocol version is not supported: 1.0.")); }); }, @@ -29,12 +29,12 @@ chrome.test.runTests([ chrome.tabs.getSelected(null, function(tab) { tabId = tab.id; debuggee = {tabId: tab.id}; - chrome.experimental.debugger.attach(debuggee, protocolVersion, pass()); + chrome.debugger.attach(debuggee, protocolVersion, pass()); }); }, function attachAgain() { - chrome.experimental.debugger.attach(debuggee, protocolVersion, + chrome.debugger.attach(debuggee, protocolVersion, fail("Another debugger is already attached to the tab with id: " + tabId + ".")); }, @@ -47,23 +47,23 @@ chrome.test.runTests([ else chrome.test.fail(); } - chrome.experimental.debugger.sendCommand(debuggee, + chrome.debugger.sendCommand(debuggee, "invalidMethod", null, onResponse); }, function detach() { - chrome.experimental.debugger.detach(debuggee, pass()); + chrome.debugger.detach(debuggee, pass()); }, function sendCommandAfterDetach() { - chrome.experimental.debugger.sendCommand(debuggee, "Foo", null, + chrome.debugger.sendCommand(debuggee, "Foo", null, fail("Debugger is not attached to the tab with id: " + tabId + ".")); }, function detachAgain() { - chrome.experimental.debugger.detach(debuggee, + chrome.debugger.detach(debuggee, fail("Debugger is not attached to the tab with id: " + tabId + ".")); }, @@ -71,13 +71,13 @@ chrome.test.runTests([ chrome.tabs.create({url:"inspected.html"}, function(tab) { function onDetach(debuggee) { chrome.test.assertEq(tab.id, debuggee.tabId); - chrome.experimental.debugger.onDetach.removeListener(onDetach); + chrome.debugger.onDetach.removeListener(onDetach); chrome.test.succeed(); } var debuggee2 = {tabId: tab.id}; - chrome.experimental.debugger.attach(debuggee2, protocolVersion, function() { - chrome.experimental.debugger.onDetach.addListener(onDetach); + chrome.debugger.attach(debuggee2, protocolVersion, function() { + chrome.debugger.onDetach.addListener(onDetach); chrome.tabs.remove(tab.id); }); }); @@ -86,7 +86,7 @@ chrome.test.runTests([ function attachToWebUI() { chrome.tabs.create({url:"chrome://version"}, function(tab) { var debuggee = {tabId: tab.id}; - chrome.experimental.debugger.attach(debuggee, protocolVersion, + chrome.debugger.attach(debuggee, protocolVersion, fail("Can not attach to the page with the \"chrome://\" scheme.")); chrome.tabs.remove(tab.id); }); diff --git a/chrome/test/data/extensions/api_test/debugger/manifest.json b/chrome/test/data/extensions/api_test/debugger/manifest.json index 5eb4179..d14b96c 100644 --- a/chrome/test/data/extensions/api_test/debugger/manifest.json +++ b/chrome/test/data/extensions/api_test/debugger/manifest.json @@ -5,7 +5,6 @@ "background_page": "background.html", "permissions": [ "tabs", - "experimental", - "http://*/*" + "debugger" ] } diff --git a/chrome/test/data/extensions/api_test/permissions/optional/background.js b/chrome/test/data/extensions/api_test/permissions/optional/background.js index cf141c0..8e3d183 100644 --- a/chrome/test/data/extensions/api_test/permissions/optional/background.js +++ b/chrome/test/data/extensions/api_test/permissions/optional/background.js @@ -116,7 +116,7 @@ chrome.test.getConfig(function(config) { // defined in "optional_permissions". function requestNonOptional() { chrome.permissions.request( - {permissions: ['debugger']}, fail(NOT_OPTIONAL_ERROR)); + {permissions: ['bookmarks']}, fail(NOT_OPTIONAL_ERROR)); chrome.permissions.request( {origins: ['http://*.b.com/*']}, fail(NOT_OPTIONAL_ERROR)); chrome.permissions.request( |