diff options
49 files changed, 140 insertions, 179 deletions
diff --git a/chrome/browser/extensions/extension_preference_api.cc b/chrome/browser/extensions/extension_preference_api.cc index a45e5b6..4b57a12 100644 --- a/chrome/browser/extensions/extension_preference_api.cc +++ b/chrome/browser/extensions/extension_preference_api.cc @@ -39,7 +39,7 @@ const char kLevelOfControl[] = "levelOfControl"; const char kValue[] = "value"; const char kOnPrefChangeFormat[] = - "experimental.preferences.%s.onChange"; + "preferences.%s.onChange"; const char kIncognitoErrorMessage[] = "You do not have permission to access incognito preferences."; diff --git a/chrome/browser/extensions/extension_preference_api.h b/chrome/browser/extensions/extension_preference_api.h index 2ff2c1b..06897ce 100644 --- a/chrome/browser/extensions/extension_preference_api.h +++ b/chrome/browser/extensions/extension_preference_api.h @@ -66,21 +66,21 @@ class GetPreferenceFunction : public SyncExtensionFunction { public: virtual ~GetPreferenceFunction(); virtual bool RunImpl(); - DECLARE_EXTENSION_FUNCTION_NAME("experimental.preferences.get") + DECLARE_EXTENSION_FUNCTION_NAME("preferences.get") }; class SetPreferenceFunction : public SyncExtensionFunction { public: virtual ~SetPreferenceFunction(); virtual bool RunImpl(); - DECLARE_EXTENSION_FUNCTION_NAME("experimental.preferences.set") + DECLARE_EXTENSION_FUNCTION_NAME("preferences.set") }; class ClearPreferenceFunction : public SyncExtensionFunction { public: virtual ~ClearPreferenceFunction(); virtual bool RunImpl(); - DECLARE_EXTENSION_FUNCTION_NAME("experimental.preferences.clear") + DECLARE_EXTENSION_FUNCTION_NAME("preferences.clear") }; #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_PREFERENCE_API_H__ diff --git a/chrome/browser/extensions/extension_proxy_api.cc b/chrome/browser/extensions/extension_proxy_api.cc index c3761555..c0c1b98 100644 --- a/chrome/browser/extensions/extension_proxy_api.cc +++ b/chrome/browser/extensions/extension_proxy_api.cc @@ -103,7 +103,7 @@ Value* ProxyPrefTransformer::ExtensionToBrowserPref(const Value* extension_pref, static_cast<const DictionaryValue*>(extension_pref); // Extract the various pieces of information passed to - // chrome.experimental.proxy.settings.set(). Several of these strings will + // chrome.proxy.settings.set(). Several of these strings will // remain blank no respective values have been passed to set(). // If a values has been passed to set but could not be parsed, we bail // out and return NULL. diff --git a/chrome/browser/extensions/extension_proxy_api_constants.cc b/chrome/browser/extensions/extension_proxy_api_constants.cc index 9078265..9203928 100644 --- a/chrome/browser/extensions/extension_proxy_api_constants.cc +++ b/chrome/browser/extensions/extension_proxy_api_constants.cc @@ -25,7 +25,7 @@ const char kProxyConfigValue[] = "value"; const char kProxyEventFatal[] = "fatal"; const char kProxyEventError[] = "error"; const char kProxyEventDetails[] = "details"; -const char kProxyEventOnProxyError[] = "experimental.proxy.onProxyError"; +const char kProxyEventOnProxyError[] = "proxy.onProxyError"; const char kPACDataUrlPrefix[] = "data:application/x-ns-proxy-autoconfig;base64,"; diff --git a/chrome/browser/extensions/extension_proxy_apitest.cc b/chrome/browser/extensions/extension_proxy_apitest.cc index 364fa31..7af1f4c 100644 --- a/chrome/browser/extensions/extension_proxy_apitest.cc +++ b/chrome/browser/extensions/extension_proxy_apitest.cc @@ -70,9 +70,6 @@ class ProxySettingsApiTest : public ExtensionApiTest { // Tests direct connection settings. IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyDirectSettings) { - CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(RunExtensionTestIncognito("proxy/direct")) << message_; const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension); @@ -84,9 +81,6 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyDirectSettings) { // Tests auto-detect settings. IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyAutoSettings) { - CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(RunExtensionTestIncognito("proxy/auto")) << message_; const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension); @@ -98,9 +92,6 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyAutoSettings) { // Tests PAC proxy settings. IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyPacScript) { - CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(RunExtensionTest("proxy/pac")) << message_; const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension); @@ -112,9 +103,6 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyPacScript) { // Tests PAC proxy settings. IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyPacData) { - CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(RunExtensionTest("proxy/pacdata")) << message_; const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension); @@ -129,9 +117,6 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyPacData) { // Tests setting a single proxy to cover all schemes. IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyFixedSingle) { - CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(RunExtensionTest("proxy/single")) << message_; const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension); @@ -146,9 +131,6 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyFixedSingle) { // Tests setting to use the system's proxy settings. IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxySystem) { - CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(RunExtensionTest("proxy/system")) << message_; const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension); @@ -160,9 +142,6 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxySystem) { // Tests setting separate proxies for each scheme. IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyFixedIndividual) { - CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(RunExtensionTestIncognito("proxy/individual")) << message_; const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension); @@ -193,9 +172,6 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyFixedIndividual) { // TODO(battre): re-enable when incognito is supported again IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, DISABLED_ProxyFixedIndividualIncognitoOnly) { - CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(RunExtensionTestIncognito("proxy/individual_incognito_only")) << message_; const Extension* extension = GetSingleLoadedExtension(); @@ -220,9 +196,6 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, // TODO(battre): re-enable when incognito is supported again IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, DISABLED_ProxyFixedIndividualIncognitoAlso) { - CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(RunExtensionTestIncognito("proxy/individual_incognito_also")) << message_; const Extension* extension = GetSingleLoadedExtension(); @@ -252,9 +225,6 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, // Tests setting and unsetting values IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyFixedIndividualRemove) { - CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(RunExtensionTest("proxy/individual_remove")) << message_; const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension); @@ -265,9 +235,6 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyFixedIndividualRemove) { IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyBypass) { - CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(RunExtensionTestIncognito("proxy/bypass")) << message_; const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension); @@ -290,8 +257,5 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, // Tests error events. IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyEvents) { - CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(RunExtensionTest("proxy/events")) << message_; } diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json index 5b76600..456b9b8 100644 --- a/chrome/common/extensions/api/extension_api.json +++ b/chrome/common/extensions/api/extension_api.json @@ -4194,7 +4194,7 @@ ] }, { - "namespace": "experimental.proxy", + "namespace": "proxy", "types": [ { "id": "ProxyServer", @@ -5314,7 +5314,7 @@ "events": [] }, { - "namespace": "experimental.extension", + "namespace": "preferences", "types": [ { "id": "Preference", diff --git a/chrome/common/extensions/docs/api_index.html b/chrome/common/extensions/docs/api_index.html index 864955c..058b7f3 100644 --- a/chrome/common/extensions/docs/api_index.html +++ b/chrome/common/extensions/docs/api_index.html @@ -342,7 +342,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="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="tabs.html" js="">tabs</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="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="preferences.html" js="">preferences</a></li><li><a href="proxy.html" js="">proxy</a></li><li><a href="tabs.html" js="">tabs</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/examples/extensions/proxy_configuration.zip b/chrome/common/extensions/docs/examples/extensions/proxy_configuration.zip Binary files differindex 519a08a..dd56dd3 100644 --- a/chrome/common/extensions/docs/examples/extensions/proxy_configuration.zip +++ b/chrome/common/extensions/docs/examples/extensions/proxy_configuration.zip diff --git a/chrome/common/extensions/docs/examples/extensions/proxy_configuration/background.html b/chrome/common/extensions/docs/examples/extensions/proxy_configuration/background.html index 870c505..be49ea7 100644 --- a/chrome/common/extensions/docs/examples/extensions/proxy_configuration/background.html +++ b/chrome/common/extensions/docs/examples/extensions/proxy_configuration/background.html @@ -21,7 +21,7 @@ // incognito settings are wiped on restart. var persistedSettings = ProxyFormController.getPersistedSettings(); if (persistedSettings !== null) { - chrome.experimental.proxy.settings.set( + chrome.proxy.settings.set( {'value': persistedSettings.regular}); } </script> diff --git a/chrome/common/extensions/docs/examples/extensions/proxy_configuration/manifest.json b/chrome/common/extensions/docs/examples/extensions/proxy_configuration/manifest.json index 9bf0834..25df355 100644 --- a/chrome/common/extensions/docs/examples/extensions/proxy_configuration/manifest.json +++ b/chrome/common/extensions/docs/examples/extensions/proxy_configuration/manifest.json @@ -15,7 +15,6 @@ }, "background_page": "background.html", "permissions": [ - "experimental", "proxy" ] } diff --git a/chrome/common/extensions/docs/examples/extensions/proxy_configuration/proxy_error_handler.js b/chrome/common/extensions/docs/examples/extensions/proxy_configuration/proxy_error_handler.js index bf6d80a..375dc35 100644 --- a/chrome/common/extensions/docs/examples/extensions/proxy_configuration/proxy_error_handler.js +++ b/chrome/common/extensions/docs/examples/extensions/proxy_configuration/proxy_error_handler.js @@ -19,12 +19,10 @@ */ function ProxyErrorHandler() { // Handle proxy error events. - chrome.experimental.proxy.onProxyError.addListener( - this.handleError_.bind(this)); + chrome.proxy.onProxyError.addListener(this.handleError_.bind(this)); // Handle message events from popup. - chrome.extension.onRequest.addListener( - this.handleOnRequest_.bind(this)); + chrome.extension.onRequest.addListener(this.handleOnRequest_.bind(this)); }; /////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/common/extensions/docs/examples/extensions/proxy_configuration/proxy_form_controller.js b/chrome/common/extensions/docs/examples/extensions/proxy_configuration/proxy_form_controller.js index 3350cf3..3dbddaa 100644 --- a/chrome/common/extensions/docs/examples/extensions/proxy_configuration/proxy_form_controller.js +++ b/chrome/common/extensions/docs/examples/extensions/proxy_configuration/proxy_form_controller.js @@ -186,7 +186,7 @@ ProxyFormController.prototype = { /** - * @see http://code.google.com/chrome/extensions/trunk/experimental.proxy.html + * @see http://code.google.com/chrome/extensions/trunk/proxy.html * @return {?ProxyServer} An object containing the proxy server host, port, * and scheme. If null, there is no single proxy. */ @@ -197,7 +197,7 @@ ProxyFormController.prototype = { /** - * @see http://code.google.com/chrome/extensions/trunk/experimental.proxy.html + * @see http://code.google.com/chrome/extensions/trunk/proxy.html * @param {?ProxyServer} data An object containing the proxy server host, * port, and scheme. If null, the single proxy checkbox will be unchecked. */ @@ -306,7 +306,7 @@ ProxyFormController.prototype = { /** * A generic mechanism for setting proxy data. * - * @see http://code.google.com/chrome/extensions/trunk/experimental.proxy.html + * @see http://code.google.com/chrome/extensions/trunk/proxy.html * @param {string} type The type of proxy that's being set ("Http", * "Https", etc.). * @param {?ProxyServer} data An object containing the proxy server host, @@ -346,10 +346,10 @@ ProxyFormController.prototype = { */ handleIncognitoAccessResponse_: function(state) { this.isAllowedIncognitoAccess_ = state; - chrome.experimental.proxy.settings.get({incognito: false}, + chrome.proxy.settings.get({incognito: false}, this.handleRegularState_.bind(this)); if (this.isAllowedIncognitoAccess_) { - chrome.experimental.proxy.settings.get({incognito: true}, + chrome.proxy.settings.get({incognito: true}, this.handleIncognitoState_.bind(this)); } }, @@ -508,7 +508,7 @@ ProxyFormController.prototype = { else this.config_.regular = this.generateProxyConfig_(); - chrome.experimental.proxy.settings.set( + chrome.proxy.settings.set( {value: this.config_.regular, scope: 'regular'}, this.callbackForRegularSettings_.bind(this)); }, @@ -526,7 +526,7 @@ ProxyFormController.prototype = { } if (this.config_.incognito) { // TODO(battre): change incognito value once available - // chrome.experimental.proxy.settings.set( + // chrome.proxy.settings.set( // {value: this.config_.incognito, scope: 'incognito'}, // this.callbackForIncognitoSettings_.bind(this)); } else { @@ -580,7 +580,7 @@ ProxyFormController.prototype = { * Parses the proxy configuration form, and generates a ProxyConfig object * that can be passed to `useCustomProxyConfig`. * - * @see http://code.google.com/chrome/extensions/trunk/experimental.proxy.html + * @see http://code.google.com/chrome/extensions/trunk/proxy.html * @return {ProxyConfig} The proxy configuration represented by the form. * @private */ diff --git a/chrome/common/extensions/docs/examples/extensions/proxy_configuration/test/proxy_form_controller_test.js b/chrome/common/extensions/docs/examples/extensions/proxy_configuration/test/proxy_form_controller_test.js index d56a2fc..ca50c40 100644 --- a/chrome/common/extensions/docs/examples/extensions/proxy_configuration/test/proxy_form_controller_test.js +++ b/chrome/common/extensions/docs/examples/extensions/proxy_configuration/test/proxy_form_controller_test.js @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Stub out the `chrome.experimental.proxy` API -chrome.experimental = chrome.experimental || { +// Stub out the `chrome.proxy` API +chrome = chrome || { proxy: { settings: { get: function() {}, @@ -57,7 +57,7 @@ var proxyform = new Test.Unit.Runner({ this.clickEvent_.initMouseEvent('click', true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null); // Reset mock functions. - chrome.experimental = { + chrome = { proxy: { settings: { get: mockFunctionFactory({ @@ -136,10 +136,10 @@ var proxyform = new Test.Unit.Runner({ }, // On instantiation, ProxyFormController should read the current state - // from `chrome.experimental.proxy.get`, and react accordingly. - // Let's see if that happens with the next four sets of assertsions. + // from `chrome.proxy.settings.get`, and react accordingly. + // Let's see if that happens with the next four sets of assertions. testSetupFormSystem: function() { - chrome.experimental.proxy.settings.get = mockFunctionFactory({ + chrome.proxy.settings.get = mockFunctionFactory({ value: {mode: 'system'}, levelOfControl: 'ControllableByThisExtension' }); @@ -150,7 +150,7 @@ var proxyform = new Test.Unit.Runner({ this.wait(100, function() { this.assertEqual( 2, - chrome.experimental.proxy.settings.get.getCallList().length); + chrome.proxy.settings.get.getCallList().length); this.assert( document.getElementById(ProxyFormController.ProxyTypes.SYSTEM) .classList.contains('active')); @@ -158,7 +158,7 @@ var proxyform = new Test.Unit.Runner({ }, testSetupFormDirect: function() { - chrome.experimental.proxy.settings.get = + chrome.proxy.settings.get = mockFunctionFactory({value: {mode: 'direct'}, levelOfControl: 'ControllableByThisExtension'}, true); @@ -168,7 +168,7 @@ var proxyform = new Test.Unit.Runner({ this.wait(100, function() { this.assertEqual( 2, - chrome.experimental.proxy.settings.get.getCallList().length); + chrome.proxy.settings.get.getCallList().length); this.assert( document.getElementById(ProxyFormController.ProxyTypes.DIRECT) .classList.contains('active')); @@ -176,7 +176,7 @@ var proxyform = new Test.Unit.Runner({ }, testSetupFormPac: function() { - chrome.experimental.proxy.settings.get = + chrome.proxy.settings.get = mockFunctionFactory({value: {mode: 'pac_script' }, levelOfControl: 'ControllableByThisExtension'}); @@ -186,7 +186,7 @@ var proxyform = new Test.Unit.Runner({ this.wait(100, function() { this.assertEqual( 2, - chrome.experimental.proxy.settings.get.getCallList().length); + chrome.proxy.settings.get.getCallList().length); this.assert( document.getElementById(ProxyFormController.ProxyTypes.PAC) .classList.contains('active')); @@ -194,7 +194,7 @@ var proxyform = new Test.Unit.Runner({ }, testSetupFormFixed: function() { - chrome.experimental.proxy.settings.get = + chrome.proxy.settings.get = mockFunctionFactory({value: {mode: 'fixed_servers' }, levelOfControl: 'ControllableByThisExtension'}); @@ -204,7 +204,7 @@ var proxyform = new Test.Unit.Runner({ this.wait(100, function() { this.assertEqual( 2, - chrome.experimental.proxy.settings.get.getCallList().length); + chrome.proxy.settings.get.getCallList().length); this.assert( document.getElementById(ProxyFormController.ProxyTypes.FIXED) .classList.contains('active')); diff --git a/chrome/common/extensions/docs/experimental.contentSettings.misc.html b/chrome/common/extensions/docs/experimental.contentSettings.misc.html index 37708b3..dd42a43 100644 --- a/chrome/common/extensions/docs/experimental.contentSettings.misc.html +++ b/chrome/common/extensions/docs/experimental.contentSettings.misc.html @@ -347,7 +347,7 @@ <span class="enum" style="display: none; ">enumerated</span> <span id="typeTemplate"> <span> - <a href="experimental.extension.html#type-Preference">Preference</a> + <a href="preferences.html#type-Preference">Preference</a> </span> <span style="display: none; "> <span> @@ -421,7 +421,7 @@ <span class="enum" style="display: none; ">enumerated</span> <span id="typeTemplate"> <span> - <a href="experimental.extension.html#type-Preference">Preference</a> + <a href="preferences.html#type-Preference">Preference</a> </span> <span style="display: none; "> <span> @@ -495,7 +495,7 @@ <span class="enum" style="display: none; ">enumerated</span> <span id="typeTemplate"> <span> - <a href="experimental.extension.html#type-Preference">Preference</a> + <a href="preferences.html#type-Preference">Preference</a> </span> <span style="display: none; "> <span> diff --git a/chrome/common/extensions/docs/experimental.html b/chrome/common/extensions/docs/experimental.html index a224743..cb23ce1 100644 --- a/chrome/common/extensions/docs/experimental.html +++ b/chrome/common/extensions/docs/experimental.html @@ -326,10 +326,8 @@ on the following experimental APIs: <a href="experimental.devtools.audits.html">experimental.devtools.audits</a></li><li> <a href="experimental.devtools.panels.html">experimental.devtools.panels</a></li><li> <a href="experimental.devtools.resources.html">experimental.devtools.resources</a></li><li> - <a href="experimental.extension.html">experimental.extension</a></li><li> <a href="experimental.infobars.html">experimental.infobars</a></li><li> <a href="experimental.processes.html">experimental.processes</a></li><li> - <a href="experimental.proxy.html">experimental.proxy</a></li><li> <a href="experimental.sidebar.html">experimental.sidebar</a></li><li> <a href="experimental.tts.html">experimental.tts</a></li><li> <a href="experimental.webNavigation.html">experimental.webNavigation</a></li><li> diff --git a/chrome/common/extensions/docs/permission_warnings.html b/chrome/common/extensions/docs/permission_warnings.html index ac27aa0..fd4a1da 100644 --- a/chrome/common/extensions/docs/permission_warnings.html +++ b/chrome/common/extensions/docs/permission_warnings.html @@ -552,7 +552,7 @@ that trigger them. <!-- HasEffectiveAccessToAllHosts() --> Any of the following: <ul> - <li> "proxy" permission (experimental) </li> + <li> "proxy" permission </li> <li> A match pattern in the "permissions" field that matches all hosts </li> <li> A "content_scripts" field with a "matches" entry @@ -563,7 +563,7 @@ that trigger them. <td> <p> The "proxy" permission is required by the - <a href="http://code.google.com/chrome/extensions/dev/experimental.proxy.html">experimental proxy</a> module. + <a href="http://code.google.com/chrome/extensions/proxy.html">proxy</a> module. </p> <p> diff --git a/chrome/common/extensions/docs/experimental.extension.html b/chrome/common/extensions/docs/preferences.html index bb92fd8..ecbdfb0 100644 --- a/chrome/common/extensions/docs/experimental.extension.html +++ b/chrome/common/extensions/docs/preferences.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> - <title>chrome.experimental.extension - Google Chrome Extensions - Google Code</title></head> + <title>chrome.preferences - 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. @@ -251,7 +251,7 @@ <div class="g-unit" id="gc-pagecontent"> <div id="pageTitle"> - <h1 class="page_title">chrome.experimental.extension</h1> + <h1 class="page_title">chrome.preferences</h1> </div> <!-- TABLE OF CONTENTS --> <div id="toc"> @@ -266,7 +266,7 @@ </ol> </li> <li> - <a href="#apiReference">API reference: chrome.experimental.extension</a> + <a href="#apiReference">API reference: chrome.preferences</a> <ol> <li style="display: none; "> <a href="#properties">Properties</a> @@ -307,7 +307,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> @@ -317,7 +317,7 @@ <!-- API PAGE --> <div class="apiPage"> <a name="apiReference"></a> - <h2>API reference: chrome.experimental.extension</h2> + <h2>API reference: chrome.preferences</h2> <!-- PROPERTIES --> <div class="apiGroup" style="display: none; "> diff --git a/chrome/common/extensions/docs/experimental.proxy.html b/chrome/common/extensions/docs/proxy.html index 20867e8..141613b 100644 --- a/chrome/common/extensions/docs/experimental.proxy.html +++ b/chrome/common/extensions/docs/proxy.html @@ -293,7 +293,7 @@ </ol> </li> <li> - <a href="#apiReference">API reference: chrome.experimental.proxy</a> + <a href="#apiReference">API reference: chrome.proxy</a> <ol> <li> <a href="#properties">Properties</a> @@ -349,10 +349,8 @@ <!-- BEGIN AUTHORED CONTENT --> <p id="classSummary"> -Use the <code>chrome.experimental.proxysettings</code> module to manage Chrome's -proxy settings. This module is still experimental. For information on how to use -experimental APIs, see the <a href="experimental.html">chrome.experimental.* - APIs</a> page. +Use the <code>chrome.proxy</code> module to manage Chrome's +proxy settings. </p> <h2 id="manifest">Manifest</h2> @@ -364,7 +362,7 @@ For example:</p> "name": "My extension", ... <b>"permissions": [ - "experimental", "proxy" + "proxy" ]</b>, ... }</pre> @@ -372,7 +370,7 @@ For example:</p> <h2 id="description">Objects and properties</h2> <p> -Proxy settings are defined in a +Proxy settings are defined in a <a href="#type-ProxyConfig"><code>ProxyConfig</code></a> object. Depending on Chrome's proxy settings, the settings may contain <a href="#type-ProxyRules"><code>ProxyRules</code></a> or a <a href="#type-PacScript"><code>PacScript</code></a>. @@ -486,7 +484,7 @@ Individual servers may be excluded from being proxied with the Examples: <code>"127.0.1", "[0:0::1]", "[::1]", "http://[::1]:99"</code></dd> <dt><code><em><ip-literal></em>/<em><prefix-length-in-bits></em></code></dt> - <dd>Match any URL containing an IP literal within the given range. The IP + <dd>Match any URL containing an IP literal within the given range. The IP range is specified using CIDR notation.<br> Examples: <code>"192.168.1.1/16", "fefe:13::abc/33"</code></dd> @@ -516,6 +514,7 @@ As the list implies, policies might overrule any changes that you specify with the proxy settings API. </p> +<!-- <p> Chrome allows using different proxy settings for regular windows and incognito windows. The following example illustrates the behavior. Assume that no policy @@ -524,7 +523,7 @@ regular windows <b>(R)</b> and proxy settings for incognito windows <b>(I)</b>. </p> <p> -</p><ul> +<ul> <li>If only <b>(R)</b> is set, these settings are effective for both regular and incognito windows.</li> <li>If only <b>(I)</b> is set, these settings are effective for only incognito @@ -533,7 +532,7 @@ regular windows <b>(R)</b> and proxy settings for incognito windows <b>(I)</b>. <li>If both <b>(R)</b> and <b>(I)</b> are set, the respective settings are used for regular and incognito windows.</li> </ul> -<p></p> +</p> <p> If two extensions want to set proxy settings, the extension installed last takes @@ -541,6 +540,7 @@ precedence over the other extensions. If the extension installed last sets only <b>(I)</b>, the settings of regular windows can be defined by more recently installed extensions. </p> +--> @@ -562,7 +562,7 @@ apply to regular and incognito windows. bypassList: ["foobar.com"] } }; -chrome.experimental.proxy.settings.set( +chrome.proxy.settings.set( {value: config, scope: 'regular'}, function() {}); </pre> @@ -581,7 +581,7 @@ The following code sets a custom pac script. "}" } }; -chrome.experimental.proxy.settings.set( +chrome.proxy.settings.set( {value: config, scope: 'regular'}, function() {}); </pre> @@ -590,7 +590,7 @@ chrome.experimental.proxy.settings.set( The next snippet queries the current proxy settings. </p> -<pre>chrome.experimental.proxy.settings.get( +<pre>chrome.proxy.settings.get( {'incognito': false}, function(config) {console.log(JSON.stringify(config));}); </pre> @@ -598,8 +598,8 @@ The next snippet queries the current proxy settings. <p> Note that the <code>value</code> object passed to <code>set()</code> is not identical to the <code>value</code> object passed to callback function of -<code>get()</code>. The latter will contain a <code>rules.httpProxy.port</code> -element. +<code>get()</code>. The latter will contain a +<code>rules.httpProxy.port</code> element. </p> <!-- END AUTHORED CONTENT --> @@ -608,7 +608,7 @@ element. <!-- API PAGE --> <div class="apiPage"> <a name="apiReference"></a> - <h2>API reference: chrome.experimental.proxy</h2> + <h2>API reference: chrome.proxy</h2> <!-- PROPERTIES --> <div class="apiGroup"> @@ -620,7 +620,7 @@ element. <h4>settings</h4> <div class="summary"> <!-- Note: intentionally longer 80 columns --> - <span>chrome.experimental.proxy.</span><span>settings</span> + <span>chrome.proxy.</span><span>settings</span> </div> <div> <dt> @@ -634,7 +634,7 @@ element. <span class="enum" style="display: none; ">enumerated</span> <span id="typeTemplate"> <span> - <a href="experimental.extension.html#type-Preference">Preference</a> + <a href="preferences.html#type-Preference">Preference</a> </span> <span style="display: none; "> <span> @@ -780,7 +780,7 @@ element. <div class="summary"> <!-- Note: intentionally longer 80 columns --> - <span class="subdued">chrome.experimental.proxy.</span><span>onProxyError</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span></span>)); + <span class="subdued">chrome.proxy.</span><span>onProxyError</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span></span>)); </div> <div class="description"> @@ -1431,7 +1431,7 @@ element. <span class="enum" style="display: none; ">enumerated</span> <span id="typeTemplate"> <span> - <a href="experimental.proxy.html#type-ProxyServer">ProxyServer</a> + <a href="proxy.html#type-ProxyServer">ProxyServer</a> </span> <span style="display: none; "> <span> @@ -1499,7 +1499,7 @@ element. <span class="enum" style="display: none; ">enumerated</span> <span id="typeTemplate"> <span> - <a href="experimental.proxy.html#type-ProxyServer">ProxyServer</a> + <a href="proxy.html#type-ProxyServer">ProxyServer</a> </span> <span style="display: none; "> <span> @@ -1567,7 +1567,7 @@ element. <span class="enum" style="display: none; ">enumerated</span> <span id="typeTemplate"> <span> - <a href="experimental.proxy.html#type-ProxyServer">ProxyServer</a> + <a href="proxy.html#type-ProxyServer">ProxyServer</a> </span> <span style="display: none; "> <span> @@ -1635,7 +1635,7 @@ element. <span class="enum" style="display: none; ">enumerated</span> <span id="typeTemplate"> <span> - <a href="experimental.proxy.html#type-ProxyServer">ProxyServer</a> + <a href="proxy.html#type-ProxyServer">ProxyServer</a> </span> <span style="display: none; "> <span> @@ -1703,7 +1703,7 @@ element. <span class="enum" style="display: none; ">enumerated</span> <span id="typeTemplate"> <span> - <a href="experimental.proxy.html#type-ProxyServer">ProxyServer</a> + <a href="proxy.html#type-ProxyServer">ProxyServer</a> </span> <span style="display: none; "> <span> @@ -2192,7 +2192,7 @@ element. <span class="enum" style="display: none; ">enumerated</span> <span id="typeTemplate"> <span> - <a href="experimental.proxy.html#type-ProxyRules">ProxyRules</a> + <a href="proxy.html#type-ProxyRules">ProxyRules</a> </span> <span style="display: none; "> <span> @@ -2260,7 +2260,7 @@ element. <span class="enum" style="display: none; ">enumerated</span> <span id="typeTemplate"> <span> - <a href="experimental.proxy.html#type-PacScript">PacScript</a> + <a href="proxy.html#type-PacScript">PacScript</a> </span> <span style="display: none; "> <span> diff --git a/chrome/common/extensions/docs/samples.html b/chrome/common/extensions/docs/samples.html index 9f2fa5e..8714657f 100644 --- a/chrome/common/extensions/docs/samples.html +++ b/chrome/common/extensions/docs/samples.html @@ -313,7 +313,7 @@ <!-- STATIC CONTENT PLACEHOLDER --> <div id="static"><link rel="stylesheet" href="css/samples.css"> -<script>var search_data = {"0262260daf0c8f7b28feff2ef23b05e7abf9d1e0":"A BROWSER ACTION WHICH CHANGES ITS ICON WHEN CLICKED. BACKGROUND_PAGE BROWSER_ACTION TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETICON","ea2894c41cb8e80a4433a3e6c5772dadce9be90d":"A BROWSER ACTION WITH A POPUP THAT CHANGES THE PAGE COLOR. BROWSER_ACTION POPUP TABS CHROME.TABS.EXECUTESCRIPT","ede3c47b7757245be42ec33fd5ca63df4b490066":"A BROWSER ACTION WITH NO ICON THAT MAKES THE PAGE RED BACKGROUND_PAGE BROWSER_ACTION TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.TABS.EXECUTESCRIPT","fbf0aa1a09a15ff8cc4fc7de4fd176d6c663d07a":"ACCEPTLANGUAGE RETURNS ACCEPT LANGUAGES OF THE BROWSER BROWSER_ACTION POPUP CHROME.I18N.GETACCEPTLANGUAGES CHROME.I18N.GETMESSAGE","9a6e4ec46997fb92b324974afa08a3d007e2537f":"ANIMATED PAGE ACTION THIS EXTENSION ADDS AN ANIMATED BROWSER ACTION TO THE TOOLBAR. BACKGROUND_PAGE PAGE_ACTION TABS CHROME.PAGEACTION.HIDE CHROME.PAGEACTION.ONCLICKED CHROME.PAGEACTION.SETICON CHROME.PAGEACTION.SETTITLE CHROME.PAGEACTION.SHOW CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.TABS.ONSELECTIONCHANGED","a1f7cf79dd555b04fa8d603247a040e644996293":"APP LAUNCHER BROWSER_ACTION MANAGEMENT CHROME.EXTENSION.GETURL CHROME.MANAGEMENT.GET CHROME.MANAGEMENT.GETALL CHROME.MANAGEMENT.LAUNCHAPP CHROME.TABS.CREATE","9747e3d6a3eab39bc7c17f11a80573c62d44c7e5":"BLANK NEW TAB PAGE CHROME_URL_OVERRIDES","9004d1a1b975859d07bdff94ea0a4baa106c4fd1":"BROKEN LINKS EXTENDS THE DEVELOPER TOOLS, ADDING AN AUDIT CATEGORY THAT FINDS BROKEN LINKS ON THE INSPECTED PAGE. BACKGROUND_PAGE DEVTOOLS_PAGE EXPERIMENTAL TABS CHROME.EXPERIMENTAL.DEVTOOLS.AUDITS.ADDCATEGORY CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.TABS.EXECUTESCRIPT CHROME.TABS.SENDREQUEST","924f75a201bb0ec8d6c0b1c9c88c679ea211c93d":"CHROME QUERY EXTENDS THE DEVELOPER TOOLS, ADDING A SIDEBAR THAT DISPLAYS THE JQUERY DATA ASSOCIATED WITH THE SELECTED DOM ELEMENT. DEVTOOLS_PAGE EXPERIMENTAL","903e7277139e1e6caec123d3319cab295d8d1b3a":"CHROME SOUNDS ENJOY A MORE MAGICAL AND IMMERSIVE EXPERIENCE WHEN BROWSING THE WEB USING THE POWER OF SOUND. BACKGROUND_PAGE BOOKMARKS OPTIONS_PAGE TABS CHROME.BOOKMARKS.ONCREATED CHROME.BOOKMARKS.ONMOVED CHROME.BOOKMARKS.ONREMOVED CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.TABS.GET CHROME.TABS.ONATTACHED CHROME.TABS.ONCREATED CHROME.TABS.ONDETACHED CHROME.TABS.ONMOVED CHROME.TABS.ONREMOVED CHROME.TABS.ONSELECTIONCHANGED CHROME.TABS.ONUPDATED CHROME.WINDOWS.ONCREATED CHROME.WINDOWS.ONFOCUSCHANGED CHROME.WINDOWS.ONREMOVED","0e790e035a4a00b6f1def5ef9a7d7be1bce95ab5":"CHROMIUM BUILDBOT MONITOR DISPLAYS THE STATUS OF THE CHROMIUM BUILDBOT IN THE TOOLBAR. CLICK TO SEE MORE DETAILED STATUS IN A POPUP. BACKGROUND_PAGE BROWSER_ACTION NOTIFICATIONS OPTIONS_PAGE POPUP CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.BROWSERACTION.SETTITLE CHROME.EXTENSION.GETURL","ac31228200b41a87982e386cc90d3a6eee4ad885":"CHROMIUM SEARCH ADD SUPPORT TO THE OMNIBOX TO SEARCH THE CHROMIUM SOURCE CODE. BACKGROUND_PAGE TABS CHROME.OMNIBOX.ONINPUTCANCELLED CHROME.OMNIBOX.ONINPUTCHANGED CHROME.OMNIBOX.ONINPUTENTERED CHROME.OMNIBOX.ONINPUTSTARTED CHROME.OMNIBOX.SETDEFAULTSUGGESTION CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.TABS.UPDATE","7d5d6cf195bc25480256618e360aa38c6e6fba82":"CLD DISPLAYS THE LANGUAGE OF A TAB BACKGROUND_PAGE BROWSER_ACTION TABS CHROME.BROWSERACTION.SETBADGETEXT CHROME.TABS.DETECTLANGUAGE CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.TABS.ONSELECTIONCHANGED CHROME.TABS.ONUPDATED","5d81304a17cf7ac2887484f730fbd2b01e51e166":"CONTEXT MENUS SAMPLE SHOWS SOME OF THE FEATURES OF THE CONTEXT MENUS API BACKGROUND_PAGE CONTEXTMENUS CHROME.CONTEXTMENUS.CREATE","4daa6becd0899a54776d9cf7f09613ed1a9f4d77":"COOKIE API TEST EXTENSION TESTING COOKIE API BACKGROUND_PAGE BROWSER_ACTION COOKIES TABS CHROME.BROWSERACTION.ONCLICKED CHROME.COOKIES.GET CHROME.COOKIES.GETALL CHROME.COOKIES.ONCHANGED CHROME.COOKIES.REMOVE CHROME.EXTENSION.GETURL CHROME.TABS.CREATE CHROME.TABS.UPDATE CHROME.WINDOWS.GET CHROME.WINDOWS.GETALL","6871d09f4a96bf9d4b6cc724d00e909cee0f3902":"CROSS-DOMAIN XMLHTTPREQUEST FROM A CONTENT SCRIPT DEMONSTRATES A METHOD TO MAKE A CROSS-DOMAIN XMLHTTPREQUEST FETCH FROM A CONTENT SCRIPT. THIS EXTENSION FETCHES THE CURRENT TRENDING TOPICS FROM TWITTER AND INSERTS THEM IN AN OVERLAY AT THE TOP OF GOOGLE NEWS. VISIT HTTP://NEWS.GOOGLE.COM TO TEST THIS EXTENSION. BACKGROUND_PAGE CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST","028eb5364924344029bcbe1d527f132fc72b34e5":"EMAIL THIS PAGE (BY GOOGLE) THIS EXTENSION ADDS AN EMAIL BUTTON TO THE TOOLBAR WHICH ALLOWS YOU TO EMAIL THE PAGE LINK USING YOUR DEFAULT MAIL CLIENT OR GMAIL. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE TABS CHROME.BROWSERACTION.ONCLICKED CHROME.EXTENSION.CONNECT CHROME.EXTENSION.ONCONNECT CHROME.TABS.CREATE CHROME.TABS.EXECUTESCRIPT CHROME.TABS.UPDATE","0bf0930a32829dfb77170535ecb27adc2de3998a":"ENABLE/DISABLE REFERRERS API EXAMPLE EXTENSION SAMPLE EXTENSION WHICH DEMONSTRATES HOW TO ACCESS A PREFERENCE. BROWSER_ACTION CONTENTSETTINGS EXPERIMENTAL POPUP CHROME.EXTENSION.ISALLOWEDINCOGNITOACCESS","763a08e9b06595d785568a8d392b95a2f3700258":"EVENT TRACKING WITH GOOGLE ANALYTICS A SAMPLE EXTENSION WHICH USES GOOGLE ANALYTICS TO TRACK USAGE. BACKGROUND_PAGE BROWSER_ACTION POPUP","e3df888a89e35bdeb9c8bc8d03be5e1851b97c68":"EXTENSION DOCS SEARCH SEARCH THE CHROME EXTENSIONS DOCUMENTATION. TO USE, TYPE CRDOC PLUS A SEARCH TERM INTO THE OMNIBOX. BACKGROUND_PAGE TABS CHROME.OMNIBOX.ONINPUTCHANGED CHROME.OMNIBOX.ONINPUTENTERED CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.ONREMOVED CHROME.TABS.UPDATE","81c9aeb77827013f15a8fdff0cf6e07332816614":"FIREPHP FOR CHROME EXTENDS THE DEVELOPER TOOLS, ADDING SUPPORT FOR PARSING FIREPHP MESSAGES FROM SERVER BACKGROUND_PAGE DEVTOOLS_PAGE EXPERIMENTAL TABS CHROME.EXPERIMENTAL.DEVTOOLS.RESOURCES.GETHAR CHROME.EXPERIMENTAL.DEVTOOLS.RESOURCES.ONFINISHED CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.TABS.EXECUTESCRIPT","8b0dd31216235941bdd8eb33fda915ef5cf79a82":"GOOGLE CALENDAR CHECKER (BY GOOGLE) QUICKLY SEE THE TIME UNTIL YOUR NEXT MEETING FROM ANY OF YOUR CALENDARS. CLICK ON THE BUTTON TO BE TAKEN TO YOUR CALENDAR. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.BROWSERACTION.SETICON CHROME.BROWSERACTION.SETTITLE CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.I18N.GETMESSAGE CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.GETALLINWINDOW CHROME.TABS.ONUPDATED CHROME.TABS.UPDATE","4e35caa9742fb82dbd628892d23a781614f6eff6":"GOOGLE DOCUMENT LIST VIEWER DEMONSTRATES HOW TO USE OAUTH TO CONNECT THE GOOGLE DOCUMENTS LIST DATA API. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE POPUP TABS CHROME.BROWSERACTION.SETBADGETEXT CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.EXTENSION.GETURL CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.TABS.ONUPDATED CHROME.TABS.REMOVE","bb57f7a0132cbeb36ad7e7bb0ab75c21704234ca":"GOOGLE MAIL CHECKER DISPLAYS THE NUMBER OF UNREAD MESSAGES IN YOUR GOOGLE MAIL INBOX. YOU CAN ALSO CLICK THE BUTTON TO OPEN YOUR INBOX. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.BROWSERACTION.SETICON CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.I18N.GETMESSAGE CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.GETALLINWINDOW CHROME.TABS.ONUPDATED CHROME.TABS.UPDATE","1682e05ea9a1bde985123b04f6f8ac50a8a64033":"GOOGLE WAVE NOTIFIER FIND OUT WHEN YOU HAVE NEW WAVES AND PREVIEW THEM FAST. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE POPUP TABS CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.EXTENSION.GETURL CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.TABS.ONUPDATED CHROME.TABS.REMOVE","14b9651fda4e57b2a5914ba73a779812201b750a":"HELLO WORLD THE FIRST EXTENSION THAT I MADE. BROWSER_ACTION POPUP","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","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","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","4f6785ec4f937add6728615682dd37c9a42d9548":"MY BOOKMARKS A BROWSER ACTION WITH A POPUP DUMP OF ALL BOOKMARKS, INCLUDING SEARCH, ADD, EDIT AND DELETE. BOOKMARKS BROWSER_ACTION POPUP TABS CHROME.BOOKMARKS.CREATE CHROME.BOOKMARKS.GET CHROME.BOOKMARKS.GETTREE CHROME.BOOKMARKS.REMOVE CHROME.BOOKMARKS.UPDATE CHROME.TABS.CREATE","597015d3bcce3da693b02314afd607bec4f55291":"NEWS READER DISPLAYS THE FIRST 5 ITEMS FROM THE GOOGLE NEWS - TOP NEWS RSS FEED IN A POPUP. BROWSER_ACTION POPUP TABS CHROME.TABS.CREATE","6444e5c8ae112a6a433909c5e770669cd16e2e5f":"NEWS READER DISPLAYS THE FIRST 5 ITEMS FROM THE GOOGLE NEWS - TOP NEWS RSS FEED IN A POPUP. BROWSER_ACTION POPUP TABS CHROME.I18N.GETMESSAGE CHROME.TABS.CREATE","3aea027164cb9b732ba4a8c51cb93708891726ef":"NEWS READER (BY GOOGLE) DISPLAYS THE LATEST STORIES FROM GOOGLE NEWS IN A POPUP. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE POPUP TABS CHROME.EXTENSION.GETURL CHROME.I18N.GETMESSAGE CHROME.TABS.CREATE","f799e26ceef2367cf836f24bcb47df4398b0df58":"NOTIFICATION DEMO SHOWS OFF DESKTOP NOTIFICATIONS, WHICH ARE TOAST WINDOWS THAT POP UP ON THE DESKTOP. BACKGROUND_PAGE NOTIFICATIONS OPTIONS_PAGE TABS CHROME.TABS.CREATE","e787b322bddbc6289bb31b7d7550b1bf6456a80b":"OMNIBOX EXAMPLE TO USE, TYPE OMNIX PLUS A SEARCH TERM INTO THE OMNIBOX. BACKGROUND_PAGE CHROME.OMNIBOX.ONINPUTCHANGED CHROME.OMNIBOX.ONINPUTENTERED","8d0a50b57c26bb498be592e871001ffed91541b4":"PAGE ACTION BY CONTENT SHOWS A PAGE ACTION FOR HTML PAGES CONTAINING THE WORD SANDWICH BACKGROUND_PAGE PAGE_ACTION CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.PAGEACTION.SHOW","80b86ccc6e8520660fa591caa565826f0ed1b12c":"PAGE ACTION BY URL SHOWS A PAGE ACTION FOR URLS WHICH HAVE THE LETTER G IN THEM. BACKGROUND_PAGE PAGE_ACTION TABS CHROME.PAGEACTION.SHOW CHROME.TABS.ONUPDATED","d74c3c18a1c1dd18b035149105a306f837c8823e":"PAGE BENCHMARKER CHROMIUM PAGE BENCHMARKER. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.BROWSERACTION.SETTITLE CHROME.EXTENSION.CONNECT CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.EXTENSION.GETEXTENSIONTABS CHROME.EXTENSION.GETURL CHROME.EXTENSION.ONCONNECT CHROME.TABS.CREATE CHROME.TABS.EXECUTESCRIPT CHROME.TABS.GET CHROME.TABS.GETALLINWINDOW CHROME.TABS.GETSELECTED CHROME.TABS.REMOVE CHROME.TABS.UPDATE CHROME.WINDOWS.GET CHROME.WINDOWS.GETCURRENT","e6ae17ab4ccfd7e059c8c01f25760ca5d894c7fd":"PRINT THIS PAGE ADDS A PRINT BUTTON TO THE BROWSER. BACKGROUND_PAGE BROWSER_ACTION TABS CHROME.BROWSERACTION.ONCLICKED CHROME.TABS.UPDATE","beff6ecd9677dea0a7c648c5042165b48bb66f09":"PROCESS MONITOR ADDS A BROWSER ACTION THAT MONITORS RESOURCE USAGE OF ALL BROWSER PROCESSES. BROWSER_ACTION EXPERIMENTAL POPUP TABS CHROME.EXPERIMENTAL.PROCESSES.ONUPDATED","3e8e226d87e431296bb110b4f6eb7eec2ca7a826":"PROXY SETTINGS SET CHROME-SPECIFIC PROXIES; A DEMONSTRATION OF CHROMES PROXY API BACKGROUND_PAGE BROWSER_ACTION EXPERIMENTAL POPUP PROXY CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.BROWSERACTION.SETTITLE CHROME.EXPERIMENTAL.PROXY.ONPROXYERROR CHROME.EXTENSION.ISALLOWEDINCOGNITOACCESS CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.I18N.GETMESSAGE","56a8d2ac24ca7bba78fd88ad57f43fc13c784497":"SAMPLE - OAUTH CONTACTS USES OAUTH TO CONNECT TO GOOGLES CONTACTS SERVICE AND DISPLAY A LIST OF YOUR CONTACTS. BACKGROUND_PAGE BROWSER_ACTION TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETICON CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.EXTENSION.GETURL CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.TABS.ONUPDATED CHROME.TABS.REMOVE","38f6e1e17756ede38b1364c7114a738ca717dcbb":"SANDWICHBAR SHOWS AN INFOBAR ON PAGES WHICH CONTAIN THE WORD SANDWICH BACKGROUND_PAGE EXPERIMENTAL CHROME.EXPERIMENTAL.INFOBARS.SHOW CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST","fc89b35755483af30b66cd72cefa34a43a3e8312":"SHOW TABS IN PROCESS ADDS A BROWSER ACTION SHOWING WHICH TABS SHARE THE CURRENT TABS PROCESS. BROWSER_ACTION EXPERIMENTAL POPUP TABS CHROME.EXPERIMENTAL.PROCESSES.GETPROCESSIDFORTAB CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.TABS.UPDATE CHROME.WINDOWS.GET CHROME.WINDOWS.GETALL CHROME.WINDOWS.GETCURRENT CHROME.WINDOWS.UPDATE","230463f2d5c3d4d0ca13c230e1f00f2aae0a8a64":"TAB INSPECTOR UTILITY FOR WORKING WITH THE EXTENSION TABS API BACKGROUND_PAGE BROWSER_ACTION TABS CHROME.BROWSERACTION.ONCLICKED CHROME.EXTENSION.GETURL CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.GETALLINWINDOW CHROME.TABS.GETSELECTED CHROME.TABS.MOVE CHROME.TABS.ONATTACHED CHROME.TABS.ONCREATED CHROME.TABS.ONDETACHED CHROME.TABS.ONMOVED CHROME.TABS.ONREMOVED CHROME.TABS.ONSELECTIONCHANGED CHROME.TABS.ONUPDATED CHROME.TABS.REMOVE CHROME.TABS.UPDATE CHROME.WINDOWS.CREATE CHROME.WINDOWS.GET CHROME.WINDOWS.GETALL CHROME.WINDOWS.GETCURRENT CHROME.WINDOWS.GETLASTFOCUSED CHROME.WINDOWS.ONCREATED CHROME.WINDOWS.ONFOCUSCHANGED CHROME.WINDOWS.ONREMOVED CHROME.WINDOWS.REMOVE CHROME.WINDOWS.UPDATE","e1697cacebad05218798bf3e8a0f724517f0e8c3":"TEST SCREENSHOT EXTENSION DEMONSTRATE SCREENSHOT FUNCTIONALITY IN THE CHROME.TABS API. BACKGROUND_PAGE BROWSER_ACTION TABS CHROME.BROWSERACTION.ONCLICKED CHROME.EXTENSION.GETURL CHROME.EXTENSION.GETVIEWS CHROME.TABS.CAPTUREVISIBLETAB CHROME.TABS.CREATE CHROME.TABS.ONUPDATED","b3de91ab04b7d7a2670ca7ee9d740eb42cead0b6":"TYPED URL HISTORY READS YOUR HISTORY, AND SHOWS THE TOP TEN PAGES YOU GO TO BY TYPING THE URL. BROWSER_ACTION HISTORY TABS CHROME.HISTORY.GETVISITS CHROME.HISTORY.SEARCH CHROME.TABS.CREATE","a3c674f7eb93621c590562ad3fa04de4f03f53a0":"WEBNAVIGATION TECH DEMO DEMONSTRATION OF THE WEBNAVIGATION EXTENSION API. BACKGROUND_PAGE BROWSER_ACTION EXPERIMENTAL EXTENSION POPUP WEBNAVIGATION CHROME.EXPERIMENTAL.WEBNAVIGATION.ONBEFORENAVIGATE CHROME.EXPERIMENTAL.WEBNAVIGATION.ONBEFORERETARGET CHROME.EXPERIMENTAL.WEBNAVIGATION.ONCOMMITTED CHROME.EXPERIMENTAL.WEBNAVIGATION.ONCOMPLETED CHROME.EXPERIMENTAL.WEBNAVIGATION.ONERROROCCURRED CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.I18N.GETMESSAGE","0fa4abe6545f0316fea7cfa07c53aa48c4f3d018":"`EXTENSION.ISALLOWED???ACCESS` EXAMPLE DEMONSTRATES THE `EXTENSION.ISALLOWED???ACCESS` APIS BROWSER_ACTION CHROME.EXTENSION.ISALLOWEDFILESCHEMEACCESS CHROME.EXTENSION.ISALLOWEDINCOGNITOACCESS"}</script> +<script>var search_data = {"0262260daf0c8f7b28feff2ef23b05e7abf9d1e0":"A BROWSER ACTION WHICH CHANGES ITS ICON WHEN CLICKED. BACKGROUND_PAGE BROWSER_ACTION TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETICON","ea2894c41cb8e80a4433a3e6c5772dadce9be90d":"A BROWSER ACTION WITH A POPUP THAT CHANGES THE PAGE COLOR. BROWSER_ACTION POPUP TABS CHROME.TABS.EXECUTESCRIPT","ede3c47b7757245be42ec33fd5ca63df4b490066":"A BROWSER ACTION WITH NO ICON THAT MAKES THE PAGE RED BACKGROUND_PAGE BROWSER_ACTION TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.TABS.EXECUTESCRIPT","fbf0aa1a09a15ff8cc4fc7de4fd176d6c663d07a":"ACCEPTLANGUAGE RETURNS ACCEPT LANGUAGES OF THE BROWSER BROWSER_ACTION POPUP CHROME.I18N.GETACCEPTLANGUAGES CHROME.I18N.GETMESSAGE","9a6e4ec46997fb92b324974afa08a3d007e2537f":"ANIMATED PAGE ACTION THIS EXTENSION ADDS AN ANIMATED BROWSER ACTION TO THE TOOLBAR. BACKGROUND_PAGE PAGE_ACTION TABS CHROME.PAGEACTION.HIDE CHROME.PAGEACTION.ONCLICKED CHROME.PAGEACTION.SETICON CHROME.PAGEACTION.SETTITLE CHROME.PAGEACTION.SHOW CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.TABS.ONSELECTIONCHANGED","a1f7cf79dd555b04fa8d603247a040e644996293":"APP LAUNCHER BROWSER_ACTION MANAGEMENT CHROME.EXTENSION.GETURL CHROME.MANAGEMENT.GET CHROME.MANAGEMENT.GETALL CHROME.MANAGEMENT.LAUNCHAPP CHROME.TABS.CREATE","9747e3d6a3eab39bc7c17f11a80573c62d44c7e5":"BLANK NEW TAB PAGE CHROME_URL_OVERRIDES","9004d1a1b975859d07bdff94ea0a4baa106c4fd1":"BROKEN LINKS EXTENDS THE DEVELOPER TOOLS, ADDING AN AUDIT CATEGORY THAT FINDS BROKEN LINKS ON THE INSPECTED PAGE. BACKGROUND_PAGE DEVTOOLS_PAGE EXPERIMENTAL TABS CHROME.EXPERIMENTAL.DEVTOOLS.AUDITS.ADDCATEGORY CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.TABS.EXECUTESCRIPT CHROME.TABS.SENDREQUEST","924f75a201bb0ec8d6c0b1c9c88c679ea211c93d":"CHROME QUERY EXTENDS THE DEVELOPER TOOLS, ADDING A SIDEBAR THAT DISPLAYS THE JQUERY DATA ASSOCIATED WITH THE SELECTED DOM ELEMENT. DEVTOOLS_PAGE EXPERIMENTAL","903e7277139e1e6caec123d3319cab295d8d1b3a":"CHROME SOUNDS ENJOY A MORE MAGICAL AND IMMERSIVE EXPERIENCE WHEN BROWSING THE WEB USING THE POWER OF SOUND. BACKGROUND_PAGE BOOKMARKS OPTIONS_PAGE TABS CHROME.BOOKMARKS.ONCREATED CHROME.BOOKMARKS.ONMOVED CHROME.BOOKMARKS.ONREMOVED CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.TABS.GET CHROME.TABS.ONATTACHED CHROME.TABS.ONCREATED CHROME.TABS.ONDETACHED CHROME.TABS.ONMOVED CHROME.TABS.ONREMOVED CHROME.TABS.ONSELECTIONCHANGED CHROME.TABS.ONUPDATED CHROME.WINDOWS.ONCREATED CHROME.WINDOWS.ONFOCUSCHANGED CHROME.WINDOWS.ONREMOVED","0e790e035a4a00b6f1def5ef9a7d7be1bce95ab5":"CHROMIUM BUILDBOT MONITOR DISPLAYS THE STATUS OF THE CHROMIUM BUILDBOT IN THE TOOLBAR. CLICK TO SEE MORE DETAILED STATUS IN A POPUP. BACKGROUND_PAGE BROWSER_ACTION NOTIFICATIONS OPTIONS_PAGE POPUP CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.BROWSERACTION.SETTITLE CHROME.EXTENSION.GETURL","ac31228200b41a87982e386cc90d3a6eee4ad885":"CHROMIUM SEARCH ADD SUPPORT TO THE OMNIBOX TO SEARCH THE CHROMIUM SOURCE CODE. BACKGROUND_PAGE TABS CHROME.OMNIBOX.ONINPUTCANCELLED CHROME.OMNIBOX.ONINPUTCHANGED CHROME.OMNIBOX.ONINPUTENTERED CHROME.OMNIBOX.ONINPUTSTARTED CHROME.OMNIBOX.SETDEFAULTSUGGESTION CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.TABS.UPDATE","7d5d6cf195bc25480256618e360aa38c6e6fba82":"CLD DISPLAYS THE LANGUAGE OF A TAB BACKGROUND_PAGE BROWSER_ACTION TABS CHROME.BROWSERACTION.SETBADGETEXT CHROME.TABS.DETECTLANGUAGE CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.TABS.ONSELECTIONCHANGED CHROME.TABS.ONUPDATED","5d81304a17cf7ac2887484f730fbd2b01e51e166":"CONTEXT MENUS SAMPLE SHOWS SOME OF THE FEATURES OF THE CONTEXT MENUS API BACKGROUND_PAGE CONTEXTMENUS CHROME.CONTEXTMENUS.CREATE","4daa6becd0899a54776d9cf7f09613ed1a9f4d77":"COOKIE API TEST EXTENSION TESTING COOKIE API BACKGROUND_PAGE BROWSER_ACTION COOKIES TABS CHROME.BROWSERACTION.ONCLICKED CHROME.COOKIES.GET CHROME.COOKIES.GETALL CHROME.COOKIES.ONCHANGED CHROME.COOKIES.REMOVE CHROME.EXTENSION.GETURL CHROME.TABS.CREATE CHROME.TABS.UPDATE CHROME.WINDOWS.GET CHROME.WINDOWS.GETALL","6871d09f4a96bf9d4b6cc724d00e909cee0f3902":"CROSS-DOMAIN XMLHTTPREQUEST FROM A CONTENT SCRIPT DEMONSTRATES A METHOD TO MAKE A CROSS-DOMAIN XMLHTTPREQUEST FETCH FROM A CONTENT SCRIPT. THIS EXTENSION FETCHES THE CURRENT TRENDING TOPICS FROM TWITTER AND INSERTS THEM IN AN OVERLAY AT THE TOP OF GOOGLE NEWS. VISIT HTTP://NEWS.GOOGLE.COM TO TEST THIS EXTENSION. BACKGROUND_PAGE CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST","028eb5364924344029bcbe1d527f132fc72b34e5":"EMAIL THIS PAGE (BY GOOGLE) THIS EXTENSION ADDS AN EMAIL BUTTON TO THE TOOLBAR WHICH ALLOWS YOU TO EMAIL THE PAGE LINK USING YOUR DEFAULT MAIL CLIENT OR GMAIL. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE TABS CHROME.BROWSERACTION.ONCLICKED CHROME.EXTENSION.CONNECT CHROME.EXTENSION.ONCONNECT CHROME.TABS.CREATE CHROME.TABS.EXECUTESCRIPT CHROME.TABS.UPDATE","0bf0930a32829dfb77170535ecb27adc2de3998a":"ENABLE/DISABLE REFERRERS API EXAMPLE EXTENSION SAMPLE EXTENSION WHICH DEMONSTRATES HOW TO ACCESS A PREFERENCE. BROWSER_ACTION CONTENTSETTINGS EXPERIMENTAL POPUP CHROME.EXTENSION.ISALLOWEDINCOGNITOACCESS","763a08e9b06595d785568a8d392b95a2f3700258":"EVENT TRACKING WITH GOOGLE ANALYTICS A SAMPLE EXTENSION WHICH USES GOOGLE ANALYTICS TO TRACK USAGE. BACKGROUND_PAGE BROWSER_ACTION POPUP","e3df888a89e35bdeb9c8bc8d03be5e1851b97c68":"EXTENSION DOCS SEARCH SEARCH THE CHROME EXTENSIONS DOCUMENTATION. TO USE, TYPE CRDOC PLUS A SEARCH TERM INTO THE OMNIBOX. BACKGROUND_PAGE TABS CHROME.OMNIBOX.ONINPUTCHANGED CHROME.OMNIBOX.ONINPUTENTERED CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.ONREMOVED CHROME.TABS.UPDATE","81c9aeb77827013f15a8fdff0cf6e07332816614":"FIREPHP FOR CHROME EXTENDS THE DEVELOPER TOOLS, ADDING SUPPORT FOR PARSING FIREPHP MESSAGES FROM SERVER BACKGROUND_PAGE DEVTOOLS_PAGE EXPERIMENTAL TABS CHROME.EXPERIMENTAL.DEVTOOLS.RESOURCES.GETHAR CHROME.EXPERIMENTAL.DEVTOOLS.RESOURCES.ONFINISHED CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.TABS.EXECUTESCRIPT","8b0dd31216235941bdd8eb33fda915ef5cf79a82":"GOOGLE CALENDAR CHECKER (BY GOOGLE) QUICKLY SEE THE TIME UNTIL YOUR NEXT MEETING FROM ANY OF YOUR CALENDARS. CLICK ON THE BUTTON TO BE TAKEN TO YOUR CALENDAR. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.BROWSERACTION.SETICON CHROME.BROWSERACTION.SETTITLE CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.I18N.GETMESSAGE CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.GETALLINWINDOW CHROME.TABS.ONUPDATED CHROME.TABS.UPDATE","4e35caa9742fb82dbd628892d23a781614f6eff6":"GOOGLE DOCUMENT LIST VIEWER DEMONSTRATES HOW TO USE OAUTH TO CONNECT THE GOOGLE DOCUMENTS LIST DATA API. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE POPUP TABS CHROME.BROWSERACTION.SETBADGETEXT CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.EXTENSION.GETURL CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.TABS.ONUPDATED CHROME.TABS.REMOVE","bb57f7a0132cbeb36ad7e7bb0ab75c21704234ca":"GOOGLE MAIL CHECKER DISPLAYS THE NUMBER OF UNREAD MESSAGES IN YOUR GOOGLE MAIL INBOX. YOU CAN ALSO CLICK THE BUTTON TO OPEN YOUR INBOX. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.BROWSERACTION.SETICON CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.I18N.GETMESSAGE CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.GETALLINWINDOW CHROME.TABS.ONUPDATED CHROME.TABS.UPDATE","1682e05ea9a1bde985123b04f6f8ac50a8a64033":"GOOGLE WAVE NOTIFIER FIND OUT WHEN YOU HAVE NEW WAVES AND PREVIEW THEM FAST. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE POPUP TABS CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.EXTENSION.GETURL CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.TABS.ONUPDATED CHROME.TABS.REMOVE","14b9651fda4e57b2a5914ba73a779812201b750a":"HELLO WORLD THE FIRST EXTENSION THAT I MADE. BROWSER_ACTION POPUP","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","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","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","4f6785ec4f937add6728615682dd37c9a42d9548":"MY BOOKMARKS A BROWSER ACTION WITH A POPUP DUMP OF ALL BOOKMARKS, INCLUDING SEARCH, ADD, EDIT AND DELETE. BOOKMARKS BROWSER_ACTION POPUP TABS CHROME.BOOKMARKS.CREATE CHROME.BOOKMARKS.GET CHROME.BOOKMARKS.GETTREE CHROME.BOOKMARKS.REMOVE CHROME.BOOKMARKS.UPDATE CHROME.TABS.CREATE","597015d3bcce3da693b02314afd607bec4f55291":"NEWS READER DISPLAYS THE FIRST 5 ITEMS FROM THE GOOGLE NEWS - TOP NEWS RSS FEED IN A POPUP. BROWSER_ACTION POPUP TABS CHROME.TABS.CREATE","6444e5c8ae112a6a433909c5e770669cd16e2e5f":"NEWS READER DISPLAYS THE FIRST 5 ITEMS FROM THE GOOGLE NEWS - TOP NEWS RSS FEED IN A POPUP. BROWSER_ACTION POPUP TABS CHROME.I18N.GETMESSAGE CHROME.TABS.CREATE","3aea027164cb9b732ba4a8c51cb93708891726ef":"NEWS READER (BY GOOGLE) DISPLAYS THE LATEST STORIES FROM GOOGLE NEWS IN A POPUP. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE POPUP TABS CHROME.EXTENSION.GETURL CHROME.I18N.GETMESSAGE CHROME.TABS.CREATE","f799e26ceef2367cf836f24bcb47df4398b0df58":"NOTIFICATION DEMO SHOWS OFF DESKTOP NOTIFICATIONS, WHICH ARE TOAST WINDOWS THAT POP UP ON THE DESKTOP. BACKGROUND_PAGE NOTIFICATIONS OPTIONS_PAGE TABS CHROME.TABS.CREATE","e787b322bddbc6289bb31b7d7550b1bf6456a80b":"OMNIBOX EXAMPLE TO USE, TYPE OMNIX PLUS A SEARCH TERM INTO THE OMNIBOX. BACKGROUND_PAGE CHROME.OMNIBOX.ONINPUTCHANGED CHROME.OMNIBOX.ONINPUTENTERED","8d0a50b57c26bb498be592e871001ffed91541b4":"PAGE ACTION BY CONTENT SHOWS A PAGE ACTION FOR HTML PAGES CONTAINING THE WORD SANDWICH BACKGROUND_PAGE PAGE_ACTION CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.PAGEACTION.SHOW","80b86ccc6e8520660fa591caa565826f0ed1b12c":"PAGE ACTION BY URL SHOWS A PAGE ACTION FOR URLS WHICH HAVE THE LETTER G IN THEM. BACKGROUND_PAGE PAGE_ACTION TABS CHROME.PAGEACTION.SHOW CHROME.TABS.ONUPDATED","d74c3c18a1c1dd18b035149105a306f837c8823e":"PAGE BENCHMARKER CHROMIUM PAGE BENCHMARKER. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.BROWSERACTION.SETTITLE CHROME.EXTENSION.CONNECT CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.EXTENSION.GETEXTENSIONTABS CHROME.EXTENSION.GETURL CHROME.EXTENSION.ONCONNECT CHROME.TABS.CREATE CHROME.TABS.EXECUTESCRIPT CHROME.TABS.GET CHROME.TABS.GETALLINWINDOW CHROME.TABS.GETSELECTED CHROME.TABS.REMOVE CHROME.TABS.UPDATE CHROME.WINDOWS.GET CHROME.WINDOWS.GETCURRENT","e6ae17ab4ccfd7e059c8c01f25760ca5d894c7fd":"PRINT THIS PAGE ADDS A PRINT BUTTON TO THE BROWSER. BACKGROUND_PAGE BROWSER_ACTION TABS CHROME.BROWSERACTION.ONCLICKED CHROME.TABS.UPDATE","beff6ecd9677dea0a7c648c5042165b48bb66f09":"PROCESS MONITOR ADDS A BROWSER ACTION THAT MONITORS RESOURCE USAGE OF ALL BROWSER PROCESSES. BROWSER_ACTION EXPERIMENTAL POPUP TABS CHROME.EXPERIMENTAL.PROCESSES.ONUPDATED","3e8e226d87e431296bb110b4f6eb7eec2ca7a826":"PROXY SETTINGS SET CHROME-SPECIFIC PROXIES; A DEMONSTRATION OF CHROMES PROXY API BACKGROUND_PAGE BROWSER_ACTION POPUP PROXY CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.BROWSERACTION.SETTITLE CHROME.EXTENSION.ISALLOWEDINCOGNITOACCESS CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.I18N.GETMESSAGE CHROME.PROXY.ONPROXYERROR","56a8d2ac24ca7bba78fd88ad57f43fc13c784497":"SAMPLE - OAUTH CONTACTS USES OAUTH TO CONNECT TO GOOGLES CONTACTS SERVICE AND DISPLAY A LIST OF YOUR CONTACTS. BACKGROUND_PAGE BROWSER_ACTION TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETICON CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.EXTENSION.GETURL CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.TABS.ONUPDATED CHROME.TABS.REMOVE","38f6e1e17756ede38b1364c7114a738ca717dcbb":"SANDWICHBAR SHOWS AN INFOBAR ON PAGES WHICH CONTAIN THE WORD SANDWICH BACKGROUND_PAGE EXPERIMENTAL CHROME.EXPERIMENTAL.INFOBARS.SHOW CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST","fc89b35755483af30b66cd72cefa34a43a3e8312":"SHOW TABS IN PROCESS ADDS A BROWSER ACTION SHOWING WHICH TABS SHARE THE CURRENT TABS PROCESS. BROWSER_ACTION EXPERIMENTAL POPUP TABS CHROME.EXPERIMENTAL.PROCESSES.GETPROCESSIDFORTAB CHROME.TABS.GET CHROME.TABS.GETSELECTED CHROME.TABS.UPDATE CHROME.WINDOWS.GET CHROME.WINDOWS.GETALL CHROME.WINDOWS.GETCURRENT CHROME.WINDOWS.UPDATE","230463f2d5c3d4d0ca13c230e1f00f2aae0a8a64":"TAB INSPECTOR UTILITY FOR WORKING WITH THE EXTENSION TABS API BACKGROUND_PAGE BROWSER_ACTION TABS CHROME.BROWSERACTION.ONCLICKED CHROME.EXTENSION.GETURL CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.GETALLINWINDOW CHROME.TABS.GETSELECTED CHROME.TABS.MOVE CHROME.TABS.ONATTACHED CHROME.TABS.ONCREATED CHROME.TABS.ONDETACHED CHROME.TABS.ONMOVED CHROME.TABS.ONREMOVED CHROME.TABS.ONSELECTIONCHANGED CHROME.TABS.ONUPDATED CHROME.TABS.REMOVE CHROME.TABS.UPDATE CHROME.WINDOWS.CREATE CHROME.WINDOWS.GET CHROME.WINDOWS.GETALL CHROME.WINDOWS.GETCURRENT CHROME.WINDOWS.GETLASTFOCUSED CHROME.WINDOWS.ONCREATED CHROME.WINDOWS.ONFOCUSCHANGED CHROME.WINDOWS.ONREMOVED CHROME.WINDOWS.REMOVE CHROME.WINDOWS.UPDATE","e1697cacebad05218798bf3e8a0f724517f0e8c3":"TEST SCREENSHOT EXTENSION DEMONSTRATE SCREENSHOT FUNCTIONALITY IN THE CHROME.TABS API. BACKGROUND_PAGE BROWSER_ACTION TABS CHROME.BROWSERACTION.ONCLICKED CHROME.EXTENSION.GETURL CHROME.EXTENSION.GETVIEWS CHROME.TABS.CAPTUREVISIBLETAB CHROME.TABS.CREATE CHROME.TABS.ONUPDATED","b3de91ab04b7d7a2670ca7ee9d740eb42cead0b6":"TYPED URL HISTORY READS YOUR HISTORY, AND SHOWS THE TOP TEN PAGES YOU GO TO BY TYPING THE URL. BROWSER_ACTION HISTORY TABS CHROME.HISTORY.GETVISITS CHROME.HISTORY.SEARCH CHROME.TABS.CREATE","a3c674f7eb93621c590562ad3fa04de4f03f53a0":"WEBNAVIGATION TECH DEMO DEMONSTRATION OF THE WEBNAVIGATION EXTENSION API. BACKGROUND_PAGE BROWSER_ACTION EXPERIMENTAL EXTENSION POPUP WEBNAVIGATION CHROME.EXPERIMENTAL.WEBNAVIGATION.ONBEFORENAVIGATE CHROME.EXPERIMENTAL.WEBNAVIGATION.ONBEFORERETARGET CHROME.EXPERIMENTAL.WEBNAVIGATION.ONCOMMITTED CHROME.EXPERIMENTAL.WEBNAVIGATION.ONCOMPLETED CHROME.EXPERIMENTAL.WEBNAVIGATION.ONERROROCCURRED CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.I18N.GETMESSAGE","0fa4abe6545f0316fea7cfa07c53aa48c4f3d018":"`EXTENSION.ISALLOWED???ACCESS` EXAMPLE DEMONSTRATES THE `EXTENSION.ISALLOWED???ACCESS` APIS BROWSER_ACTION CHROME.EXTENSION.ISALLOWEDFILESCHEMEACCESS CHROME.EXTENSION.ISALLOWEDINCOGNITOACCESS"}</script> <script src="js/sample_search.js"></script> @@ -355,6 +355,10 @@ </span><span> <a href="javascript:void(0);" onclick="setFilter('chrome.pageAction', this)">chrome.pageAction</a><span>, </span> </span><span> + <a href="javascript:void(0);" onclick="setFilter('chrome.preferences', this)">chrome.preferences</a><span>, </span> + </span><span> + <a href="javascript:void(0);" onclick="setFilter('chrome.proxy', this)">chrome.proxy</a><span>, </span> + </span><span> <a href="javascript:void(0);" onclick="setFilter('chrome.tabs', this)">chrome.tabs</a><span>, </span> </span><span> <a href="javascript:void(0);" onclick="setFilter('chrome.windows', this)">chrome.windows</a><span style="display: none; ">, </span> @@ -2689,9 +2693,6 @@ <strong>browser_action</strong><span>, </span> <span style="display: none; "> and</span> </span><span> - <strong>experimental</strong><span>, </span> - <span style="display: none; "> and</span> - </span><span> <strong>popup</strong><span style="display: none; ">, </span> <span> and</span> </span><span> @@ -2709,8 +2710,6 @@ </li><li> <code><a href="browserAction.html#method-setTitle">chrome.browserAction.setTitle</a></code> </li><li> - <code><a href="experimental.proxy.html#event-onProxyError">chrome.experimental.proxy.onProxyError</a></code> - </li><li> <code><a href="extension.html#method-isAllowedIncognitoAccess">chrome.extension.isAllowedIncognitoAccess</a></code> </li><li> <code><a href="extension.html#event-onRequest">chrome.extension.onRequest</a></code> @@ -2718,6 +2717,8 @@ <code><a href="extension.html#method-sendRequest">chrome.extension.sendRequest</a></code> </li><li> <code><a href="i18n.html#method-getMessage">chrome.i18n.getMessage</a></code> + </li><li> + <code><a href="proxy.html#event-onProxyError">chrome.proxy.onProxyError</a></code> </li> </ul> </div> diff --git a/chrome/common/extensions/docs/samples.json b/chrome/common/extensions/docs/samples.json index ccd354c..5147e93 100644 --- a/chrome/common/extensions/docs/samples.json +++ b/chrome/common/extensions/docs/samples.json @@ -48,7 +48,6 @@ "chrome.experimental.infobars.show": "experimental.infobars.html#method-show", "chrome.experimental.processes.getProcessIdForTab": "experimental.processes.html#method-getProcessIdForTab", "chrome.experimental.processes.onUpdated": "experimental.processes.html#event-onUpdated", - "chrome.experimental.proxy.onProxyError": "experimental.proxy.html#event-onProxyError", "chrome.experimental.sidebar.collapse": "experimental.sidebar.html#method-collapse", "chrome.experimental.sidebar.expand": "experimental.sidebar.html#method-expand", "chrome.experimental.sidebar.getState": "experimental.sidebar.html#method-getState", @@ -128,6 +127,7 @@ "chrome.pageAction.setPopup": "pageAction.html#method-setPopup", "chrome.pageAction.setTitle": "pageAction.html#method-setTitle", "chrome.pageAction.show": "pageAction.html#method-show", + "chrome.proxy.onProxyError": "proxy.html#event-onProxyError", "chrome.tabs.captureVisibleTab": "tabs.html#method-captureVisibleTab", "chrome.tabs.connect": "tabs.html#method-connect", "chrome.tabs.create": "tabs.html#method-create", @@ -1529,17 +1529,16 @@ "chrome.browserAction.setBadgeBackgroundColor", "chrome.browserAction.setBadgeText", "chrome.browserAction.setTitle", - "chrome.experimental.proxy.onProxyError", "chrome.extension.isAllowedIncognitoAccess", "chrome.extension.onRequest", "chrome.extension.sendRequest", - "chrome.i18n.getMessage" + "chrome.i18n.getMessage", + "chrome.proxy.onProxyError" ], "description": "Set Chrome-specific proxies; a demonstration of Chrome's Proxy API", "features": [ "background_page", "browser_action", - "experimental", "popup", "proxy" ], @@ -1548,7 +1547,7 @@ "name": "Proxy Settings", "path": "examples\/extensions\/proxy_configuration\/", "protocols": [], - "search_string": "PROXY SETTINGS SET CHROME-SPECIFIC PROXIES; A DEMONSTRATION OF CHROMES PROXY API BACKGROUND_PAGE BROWSER_ACTION EXPERIMENTAL POPUP PROXY CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.BROWSERACTION.SETTITLE CHROME.EXPERIMENTAL.PROXY.ONPROXYERROR CHROME.EXTENSION.ISALLOWEDINCOGNITOACCESS CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.I18N.GETMESSAGE", + "search_string": "PROXY SETTINGS SET CHROME-SPECIFIC PROXIES; A DEMONSTRATION OF CHROMES PROXY API BACKGROUND_PAGE BROWSER_ACTION POPUP PROXY CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.BROWSERACTION.SETTITLE CHROME.EXTENSION.ISALLOWEDINCOGNITOACCESS CHROME.EXTENSION.ONREQUEST CHROME.EXTENSION.SENDREQUEST CHROME.I18N.GETMESSAGE CHROME.PROXY.ONPROXYERROR", "source_files": [ "_locales\/en\/messages.json", "background.html", @@ -1561,7 +1560,7 @@ "test\/proxy_form_controller_test.js", "test\/unittest.css" ], - "source_hash": "d4a52c15b1e5c8be5b26fe9305cf4aae0f2b0cc3", + "source_hash": "8afed2f83448a621f4f55529fe16c90f858750e1", "zip_path": "examples\/extensions\/proxy_configuration.zip" }, { diff --git a/chrome/common/extensions/docs/static/permission_warnings.html b/chrome/common/extensions/docs/static/permission_warnings.html index c1251a5..56c0bce 100644 --- a/chrome/common/extensions/docs/static/permission_warnings.html +++ b/chrome/common/extensions/docs/static/permission_warnings.html @@ -228,7 +228,7 @@ that trigger them. <!-- HasEffectiveAccessToAllHosts() --> Any of the following: <ul> - <li> "proxy" permission (experimental) </li> + <li> "proxy" permission </li> <li> A match pattern in the "permissions" field that matches all hosts </li> <li> A "content_scripts" field with a "matches" entry @@ -239,7 +239,7 @@ that trigger them. <td> <p> The "proxy" permission is required by the - <a href="http://code.google.com/chrome/extensions/dev/experimental.proxy.html">experimental proxy</a> module. + <a href="http://code.google.com/chrome/extensions/proxy.html">proxy</a> module. </p> <p> diff --git a/chrome/common/extensions/docs/static/experimental.proxy.html b/chrome/common/extensions/docs/static/proxy.html index d391a95..946bf0a 100644 --- a/chrome/common/extensions/docs/static/experimental.proxy.html +++ b/chrome/common/extensions/docs/static/proxy.html @@ -2,10 +2,8 @@ <!-- BEGIN AUTHORED CONTENT --> <p id="classSummary"> -Use the <code>chrome.experimental.proxysettings</code> module to manage Chrome's -proxy settings. This module is still experimental. For information on how to use -experimental APIs, see the <a href="experimental.html">chrome.experimental.* - APIs</a> page. +Use the <code>chrome.proxy</code> module to manage Chrome's +proxy settings. </p> <h2 id="manifest">Manifest</h2> @@ -17,7 +15,7 @@ For example:</p> "name": "My extension", ... <b>"permissions": [ - "experimental", "proxy" + "proxy" ]</b>, ... }</pre> @@ -25,7 +23,7 @@ For example:</p> <h2 id="description">Objects and properties</h2> <p> -Proxy settings are defined in a +Proxy settings are defined in a <a href="#type-ProxyConfig"><code>ProxyConfig</code></a> object. Depending on Chrome's proxy settings, the settings may contain <a href="#type-ProxyRules"><code>ProxyRules</code></a> or a <a @@ -140,7 +138,7 @@ Individual servers may be excluded from being proxied with the Examples: <code>"127.0.1", "[0:0::1]", "[::1]", "http://[::1]:99"</code></dd> <dt><code><em><ip-literal></em>/<em><prefix-length-in-bits></em></code></dt> - <dd>Match any URL containing an IP literal within the given range. The IP + <dd>Match any URL containing an IP literal within the given range. The IP range is specified using CIDR notation.<br> Examples: <code>"192.168.1.1/16", "fefe:13::abc/33"</code></dd> @@ -170,6 +168,7 @@ As the list implies, policies might overrule any changes that you specify with the proxy settings API. </p> +<!-- <p> Chrome allows using different proxy settings for regular windows and incognito windows. The following example illustrates the behavior. Assume that no policy @@ -195,6 +194,7 @@ precedence over the other extensions. If the extension installed last sets only <b>(I)</b>, the settings of regular windows can be defined by more recently installed extensions. </p> +--> @@ -217,7 +217,7 @@ var config = { bypassList: ["foobar.com"] } }; -chrome.experimental.proxy.settings.set( +chrome.proxy.settings.set( {value: config, scope: 'regular'}, function() {}); </pre> @@ -237,7 +237,7 @@ var config = { "}" } }; -chrome.experimental.proxy.settings.set( +chrome.proxy.settings.set( {value: config, scope: 'regular'}, function() {}); </pre> @@ -247,7 +247,7 @@ The next snippet queries the current proxy settings. </p> <pre> -chrome.experimental.proxy.settings.get( +chrome.proxy.settings.get( {'incognito': false}, function(config) {console.log(JSON.stringify(config));}); </pre> @@ -255,8 +255,8 @@ chrome.experimental.proxy.settings.get( <p> Note that the <code>value</code> object passed to <code>set()</code> is not identical to the <code>value</code> object passed to callback function of -<code>get()</code>. The latter will contain a <code>rules.httpProxy.port</code> -element. +<code>get()</code>. The latter will contain a +<code>rules.httpProxy.port</code> element. </p> <!-- END AUTHORED CONTENT --> diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index 788fc89..bd62b97 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -110,6 +110,7 @@ const char kI18NModuleName[] = "i18n"; const char kOmniboxModuleName[] = "omnibox"; const char kPageActionModuleName[] = "pageAction"; const char kPageActionsModuleName[] = "pageActions"; +const char kPreferenceModuleName[] = "preferences"; const char kTestModuleName[] = "test"; // Names of modules that can be used without listing it in the permissions @@ -123,6 +124,7 @@ const char* kNonPermissionModuleNames[] = { kOmniboxModuleName, kPageActionModuleName, kPageActionsModuleName, + kPreferenceModuleName, kTestModuleName }; const size_t kNumNonPermissionModuleNames = diff --git a/chrome/renderer/resources/extension_process_bindings.js b/chrome/renderer/resources/extension_process_bindings.js index 89fd3d4..2f11847 100644 --- a/chrome/renderer/resources/extension_process_bindings.js +++ b/chrome/renderer/resources/extension_process_bindings.js @@ -351,7 +351,7 @@ var chrome = chrome || {}; this.get = function(details, callback) { var getSchema = this.parameters.get; chromeHidden.validate([details, callback], getSchema); - return sendRequest('experimental.preferences.get', + return sendRequest('preferences.get', [prefKey, details, callback], extendSchema(getSchema)); }; @@ -359,19 +359,18 @@ var chrome = chrome || {}; var setSchema = this.parameters.set.slice(); setSchema[0].properties.value = valueSchema; chromeHidden.validate([details, callback], setSchema); - return sendRequest('experimental.preferences.set', + return sendRequest('preferences.set', [prefKey, details, callback], extendSchema(setSchema)); }; this.clear = function(details, callback) { var clearSchema = this.parameters.clear; chromeHidden.validate([details, callback], clearSchema); - return sendRequest('experimental.preferences.clear', + return sendRequest('preferences.clear', [prefKey, details, callback], extendSchema(clearSchema)); }; - this.onChange = new chrome.Event('experimental.preferences.' - + prefKey + '.onChange'); + this.onChange = new chrome.Event('preferences.' + prefKey + '.onChange'); }; customBindings['Preference'].prototype = new CustomBindingsObject(); } diff --git a/chrome/renderer/resources/renderer_extension_bindings.js b/chrome/renderer/resources/renderer_extension_bindings.js index 5427e1ad..f773303 100644 --- a/chrome/renderer/resources/renderer_extension_bindings.js +++ b/chrome/renderer/resources/renderer_extension_bindings.js @@ -310,7 +310,6 @@ var chrome = chrome || {}; "experimental.metrics", "experimental.popup", "experimental.processes", - "experimental.proxy", "experimental.rlz", "experimental.sidebar", "experimental.tts", @@ -325,6 +324,8 @@ var chrome = chrome || {}; "omnibox", "pageAction", "pageActions", + "preferences", + "proxy", "tabs", "test", "toolstrip", diff --git a/chrome/test/data/extensions/api_test/proxy/auto/manifest.json b/chrome/test/data/extensions/api_test/proxy/auto/manifest.json index ada15d1..273db99 100644 --- a/chrome/test/data/extensions/api_test/proxy/auto/manifest.json +++ b/chrome/test/data/extensions/api_test/proxy/auto/manifest.json @@ -3,5 +3,5 @@ "version": "0.1", "description": "end-to-end browser test for chrome.proxy API", "background_page": "test.html", - "permissions": ["experimental", "proxy"] + "permissions": ["proxy"] } diff --git a/chrome/test/data/extensions/api_test/proxy/auto/test.js b/chrome/test/data/extensions/api_test/proxy/auto/test.js index be6d479..58240db 100644 --- a/chrome/test/data/extensions/api_test/proxy/auto/test.js +++ b/chrome/test/data/extensions/api_test/proxy/auto/test.js @@ -22,19 +22,19 @@ chrome.test.runTests([ chrome.test.succeed(); }, function setAutoSettings() { - chrome.experimental.proxy.settings.set( + chrome.proxy.settings.set( {'value': config}, chrome.test.callbackPass()); }, function verifyRegular() { - chrome.experimental.proxy.settings.get( + chrome.proxy.settings.get( {'incognito': false}, expect({ 'value': config, 'levelOfControl': "ControlledByThisExtension" }, "invalid proxy settings")); }, function verifyIncognito() { - chrome.experimental.proxy.settings.get( + chrome.proxy.settings.get( {'incognito': true}, expect({ 'value': config, 'incognitoSpecific': false, diff --git a/chrome/test/data/extensions/api_test/proxy/bypass/manifest.json b/chrome/test/data/extensions/api_test/proxy/bypass/manifest.json index ada15d1..273db99 100644 --- a/chrome/test/data/extensions/api_test/proxy/bypass/manifest.json +++ b/chrome/test/data/extensions/api_test/proxy/bypass/manifest.json @@ -3,5 +3,5 @@ "version": "0.1", "description": "end-to-end browser test for chrome.proxy API", "background_page": "test.html", - "permissions": ["experimental", "proxy"] + "permissions": ["proxy"] } diff --git a/chrome/test/data/extensions/api_test/proxy/bypass/test.js b/chrome/test/data/extensions/api_test/proxy/bypass/test.js index 469b3ff..fce860f 100644 --- a/chrome/test/data/extensions/api_test/proxy/bypass/test.js +++ b/chrome/test/data/extensions/api_test/proxy/bypass/test.js @@ -39,19 +39,19 @@ chrome.test.runTests([ chrome.test.succeed(); }, function setIndividualProxies() { - chrome.experimental.proxy.settings.set( + chrome.proxy.settings.set( {'value': config}, chrome.test.callbackPass()); }, function verifyRegular() { - chrome.experimental.proxy.settings.get( + chrome.proxy.settings.get( {'incognito': false}, expect({ 'value': configExpected, 'levelOfControl': "ControlledByThisExtension" }, "invalid proxy settings")); }, function verifyIncognito() { - chrome.experimental.proxy.settings.get( + chrome.proxy.settings.get( {'incognito': true}, expect({ 'value': configExpected, 'incognitoSpecific': false, diff --git a/chrome/test/data/extensions/api_test/proxy/direct/manifest.json b/chrome/test/data/extensions/api_test/proxy/direct/manifest.json index ada15d1..273db99 100644 --- a/chrome/test/data/extensions/api_test/proxy/direct/manifest.json +++ b/chrome/test/data/extensions/api_test/proxy/direct/manifest.json @@ -3,5 +3,5 @@ "version": "0.1", "description": "end-to-end browser test for chrome.proxy API", "background_page": "test.html", - "permissions": ["experimental", "proxy"] + "permissions": ["proxy"] } diff --git a/chrome/test/data/extensions/api_test/proxy/direct/test.js b/chrome/test/data/extensions/api_test/proxy/direct/test.js index 71a9940..54500e0 100644 --- a/chrome/test/data/extensions/api_test/proxy/direct/test.js +++ b/chrome/test/data/extensions/api_test/proxy/direct/test.js @@ -22,19 +22,19 @@ chrome.test.runTests([ chrome.test.succeed(); }, function setAutoSettings() { - chrome.experimental.proxy.settings.set( + chrome.proxy.settings.set( {'value': config}, chrome.test.callbackPass()); }, function verifyRegular() { - chrome.experimental.proxy.settings.get( + chrome.proxy.settings.get( {'incognito': false}, expect({ 'value': config, 'levelOfControl': "ControlledByThisExtension" }, "invalid proxy settings")); }, function verifyIncognito() { - chrome.experimental.proxy.settings.get( + chrome.proxy.settings.get( {'incognito': true}, expect({ 'value': config, 'incognitoSpecific': false, diff --git a/chrome/test/data/extensions/api_test/proxy/events/manifest.json b/chrome/test/data/extensions/api_test/proxy/events/manifest.json index f763c13..71604e0 100644 --- a/chrome/test/data/extensions/api_test/proxy/events/manifest.json +++ b/chrome/test/data/extensions/api_test/proxy/events/manifest.json @@ -3,5 +3,5 @@ "version": "0.1", "description": "end-to-end browser test for chrome.proxy API", "background_page": "test.html", - "permissions": ["experimental", "proxy", "http://127.0.0.1/"] + "permissions": ["proxy", "http://127.0.0.1/"] } diff --git a/chrome/test/data/extensions/api_test/proxy/events/test.js b/chrome/test/data/extensions/api_test/proxy/events/test.js index 2a615b7..3c941ff 100644 --- a/chrome/test/data/extensions/api_test/proxy/events/test.js +++ b/chrome/test/data/extensions/api_test/proxy/events/test.js @@ -24,7 +24,7 @@ var expected_events = [ } ]; -chrome.experimental.proxy.onProxyError.addListener(function (error) { +chrome.proxy.onProxyError.addListener(function (error) { captured_events.push(error); if (captured_events.length < expected_events.length) return; @@ -40,7 +40,7 @@ function pacTest(e) { mandatory: false } }; - chrome.experimental.proxy.settings.set({'value': config}); + chrome.proxy.settings.set({'value': config}); } var rules = { @@ -48,7 +48,7 @@ var rules = { }; var config = { rules: rules, mode: "fixed_servers" }; -chrome.experimental.proxy.settings.set({'value': config}, function () { +chrome.proxy.settings.set({'value': config}, function () { var req = new XMLHttpRequest(); req.open("GET", "http://127.0.0.1/", true); req.onload = function () { diff --git a/chrome/test/data/extensions/api_test/proxy/individual/manifest.json b/chrome/test/data/extensions/api_test/proxy/individual/manifest.json index ada15d1..273db99 100644 --- a/chrome/test/data/extensions/api_test/proxy/individual/manifest.json +++ b/chrome/test/data/extensions/api_test/proxy/individual/manifest.json @@ -3,5 +3,5 @@ "version": "0.1", "description": "end-to-end browser test for chrome.proxy API", "background_page": "test.html", - "permissions": ["experimental", "proxy"] + "permissions": ["proxy"] } diff --git a/chrome/test/data/extensions/api_test/proxy/individual/test.js b/chrome/test/data/extensions/api_test/proxy/individual/test.js index 860e3db..dade2a5 100644 --- a/chrome/test/data/extensions/api_test/proxy/individual/test.js +++ b/chrome/test/data/extensions/api_test/proxy/individual/test.js @@ -66,19 +66,19 @@ chrome.test.runTests([ chrome.test.succeed(); }, function setIndividualProxies() { - chrome.experimental.proxy.settings.set( + chrome.proxy.settings.set( {'value': config}, chrome.test.callbackPass()); }, function verifyRegular() { - chrome.experimental.proxy.settings.get( + chrome.proxy.settings.get( {'incognito': false}, expect({ 'value': configExpected, 'levelOfControl': "ControlledByThisExtension" }, "invalid proxy settings")); }, function verifyIncognito() { - chrome.experimental.proxy.settings.get( + chrome.proxy.settings.get( {'incognito': true}, expect({ 'value': configExpected, 'incognitoSpecific': false, diff --git a/chrome/test/data/extensions/api_test/proxy/individual_incognito_also/manifest.json b/chrome/test/data/extensions/api_test/proxy/individual_incognito_also/manifest.json index ada15d1..273db99 100644 --- a/chrome/test/data/extensions/api_test/proxy/individual_incognito_also/manifest.json +++ b/chrome/test/data/extensions/api_test/proxy/individual_incognito_also/manifest.json @@ -3,5 +3,5 @@ "version": "0.1", "description": "end-to-end browser test for chrome.proxy API", "background_page": "test.html", - "permissions": ["experimental", "proxy"] + "permissions": ["proxy"] } diff --git a/chrome/test/data/extensions/api_test/proxy/individual_incognito_also/test.js b/chrome/test/data/extensions/api_test/proxy/individual_incognito_also/test.js index 5ea46bb..d278bbd 100644 --- a/chrome/test/data/extensions/api_test/proxy/individual_incognito_also/test.js +++ b/chrome/test/data/extensions/api_test/proxy/individual_incognito_also/test.js @@ -38,7 +38,7 @@ chrome.test.runTests([ }; var config = { rules: rules, mode: "fixed_servers" }; - chrome.experimental.proxy.settings.set( + chrome.proxy.settings.set( {'value': config, 'incognito': false}, chrome.test.callbackPass()); }, @@ -68,7 +68,7 @@ chrome.test.runTests([ }; var config = { rules: rules, mode: "fixed_servers" }; - chrome.experimental.proxy.settings.set( + chrome.proxy.settings.set( {'value': config, 'incognito': true}, chrome.test.callbackPass()); } diff --git a/chrome/test/data/extensions/api_test/proxy/individual_incognito_only/manifest.json b/chrome/test/data/extensions/api_test/proxy/individual_incognito_only/manifest.json index ada15d1..273db99 100644 --- a/chrome/test/data/extensions/api_test/proxy/individual_incognito_only/manifest.json +++ b/chrome/test/data/extensions/api_test/proxy/individual_incognito_only/manifest.json @@ -3,5 +3,5 @@ "version": "0.1", "description": "end-to-end browser test for chrome.proxy API", "background_page": "test.html", - "permissions": ["experimental", "proxy"] + "permissions": ["proxy"] } diff --git a/chrome/test/data/extensions/api_test/proxy/individual_incognito_only/test.js b/chrome/test/data/extensions/api_test/proxy/individual_incognito_only/test.js index 2c29639..1852dd4 100644 --- a/chrome/test/data/extensions/api_test/proxy/individual_incognito_only/test.js +++ b/chrome/test/data/extensions/api_test/proxy/individual_incognito_only/test.js @@ -38,7 +38,7 @@ chrome.test.runTests([ }; var config = { rules: rules, mode: "fixed_servers" }; - chrome.experimental.proxy.settings.set( + chrome.proxy.settings.set( {'value': config, 'incognito': true}, chrome.test.callbackPass()); } diff --git a/chrome/test/data/extensions/api_test/proxy/individual_remove/manifest.json b/chrome/test/data/extensions/api_test/proxy/individual_remove/manifest.json index ada15d1..273db99 100644 --- a/chrome/test/data/extensions/api_test/proxy/individual_remove/manifest.json +++ b/chrome/test/data/extensions/api_test/proxy/individual_remove/manifest.json @@ -3,5 +3,5 @@ "version": "0.1", "description": "end-to-end browser test for chrome.proxy API", "background_page": "test.html", - "permissions": ["experimental", "proxy"] + "permissions": ["proxy"] } diff --git a/chrome/test/data/extensions/api_test/proxy/individual_remove/test.js b/chrome/test/data/extensions/api_test/proxy/individual_remove/test.js index f62019d..4b47c72 100644 --- a/chrome/test/data/extensions/api_test/proxy/individual_remove/test.js +++ b/chrome/test/data/extensions/api_test/proxy/individual_remove/test.js @@ -39,12 +39,12 @@ chrome.test.runTests([ chrome.test.succeed(); }, function setIndividualProxies() { - chrome.experimental.proxy.settings.set( + chrome.proxy.settings.set( {'value': config, 'scope': 'regular'}, chrome.test.callbackPass()); }, function clearProxies() { - chrome.experimental.proxy.settings.clear( + chrome.proxy.settings.clear( {'scope': 'regular'}, chrome.test.callbackPass()); } diff --git a/chrome/test/data/extensions/api_test/proxy/pac/manifest.json b/chrome/test/data/extensions/api_test/proxy/pac/manifest.json index ada15d1..273db99 100644 --- a/chrome/test/data/extensions/api_test/proxy/pac/manifest.json +++ b/chrome/test/data/extensions/api_test/proxy/pac/manifest.json @@ -3,5 +3,5 @@ "version": "0.1", "description": "end-to-end browser test for chrome.proxy API", "background_page": "test.html", - "permissions": ["experimental", "proxy"] + "permissions": ["proxy"] } diff --git a/chrome/test/data/extensions/api_test/proxy/pac/test.js b/chrome/test/data/extensions/api_test/proxy/pac/test.js index 83e0c22..36b1a00 100644 --- a/chrome/test/data/extensions/api_test/proxy/pac/test.js +++ b/chrome/test/data/extensions/api_test/proxy/pac/test.js @@ -19,7 +19,7 @@ chrome.test.runTests([ mode: "pac_script", pacScript: pacScriptObject }; - chrome.experimental.proxy.settings.set( + chrome.proxy.settings.set( {'value': config}, chrome.test.callbackPass()); } diff --git a/chrome/test/data/extensions/api_test/proxy/pacdata/manifest.json b/chrome/test/data/extensions/api_test/proxy/pacdata/manifest.json index ada15d1..273db99 100644 --- a/chrome/test/data/extensions/api_test/proxy/pacdata/manifest.json +++ b/chrome/test/data/extensions/api_test/proxy/pacdata/manifest.json @@ -3,5 +3,5 @@ "version": "0.1", "description": "end-to-end browser test for chrome.proxy API", "background_page": "test.html", - "permissions": ["experimental", "proxy"] + "permissions": ["proxy"] } diff --git a/chrome/test/data/extensions/api_test/proxy/pacdata/test.js b/chrome/test/data/extensions/api_test/proxy/pacdata/test.js index e9fab71..fb65911 100644 --- a/chrome/test/data/extensions/api_test/proxy/pacdata/test.js +++ b/chrome/test/data/extensions/api_test/proxy/pacdata/test.js @@ -31,12 +31,12 @@ chrome.test.runTests([ chrome.test.succeed(); }, function setAutoSettings() { - chrome.experimental.proxy.settings.set( + chrome.proxy.settings.set( {'value': config}, chrome.test.callbackPass()); }, function verifySettings() { - chrome.experimental.proxy.settings.get( + chrome.proxy.settings.get( {'incognito': false}, expect({ 'value': config, 'levelOfControl': "ControlledByThisExtension" }, diff --git a/chrome/test/data/extensions/api_test/proxy/single/manifest.json b/chrome/test/data/extensions/api_test/proxy/single/manifest.json index ada15d1..273db99 100644 --- a/chrome/test/data/extensions/api_test/proxy/single/manifest.json +++ b/chrome/test/data/extensions/api_test/proxy/single/manifest.json @@ -3,5 +3,5 @@ "version": "0.1", "description": "end-to-end browser test for chrome.proxy API", "background_page": "test.html", - "permissions": ["experimental", "proxy"] + "permissions": ["proxy"] } diff --git a/chrome/test/data/extensions/api_test/proxy/single/test.js b/chrome/test/data/extensions/api_test/proxy/single/test.js index 038f09f..087d7c8 100644 --- a/chrome/test/data/extensions/api_test/proxy/single/test.js +++ b/chrome/test/data/extensions/api_test/proxy/single/test.js @@ -22,7 +22,7 @@ chrome.test.runTests([ }; var config = { rules: rules, mode: "fixed_servers" }; - chrome.experimental.proxy.settings.set( + chrome.proxy.settings.set( {'value': config}, chrome.test.callbackPass()); } diff --git a/chrome/test/data/extensions/api_test/proxy/system/manifest.json b/chrome/test/data/extensions/api_test/proxy/system/manifest.json index ada15d1..273db99 100644 --- a/chrome/test/data/extensions/api_test/proxy/system/manifest.json +++ b/chrome/test/data/extensions/api_test/proxy/system/manifest.json @@ -3,5 +3,5 @@ "version": "0.1", "description": "end-to-end browser test for chrome.proxy API", "background_page": "test.html", - "permissions": ["experimental", "proxy"] + "permissions": ["proxy"] } diff --git a/chrome/test/data/extensions/api_test/proxy/system/test.js b/chrome/test/data/extensions/api_test/proxy/system/test.js index 450c792..a8b92e0 100644 --- a/chrome/test/data/extensions/api_test/proxy/system/test.js +++ b/chrome/test/data/extensions/api_test/proxy/system/test.js @@ -13,7 +13,7 @@ chrome.test.runTests([ }, function setSystemProxy() { var config = { mode: "system" }; - chrome.experimental.proxy.settings.set( + chrome.proxy.settings.set( {'value': config}, chrome.test.callbackPass()); } |