diff options
| author | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-15 15:52:44 +0000 |
|---|---|---|
| committer | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-15 15:52:44 +0000 |
| commit | 9793803ad5cb6e3603d815c60d58c6797f562ec4 (patch) | |
| tree | af5b9dbbd41f8acc01204de2fff51338e14b9ff4 /chrome/common | |
| parent | 0af03baa6b6417a1625cbd7b1127c1741701da2b (diff) | |
| download | chromium_src-9793803ad5cb6e3603d815c60d58c6797f562ec4.zip chromium_src-9793803ad5cb6e3603d815c60d58c6797f562ec4.tar.gz chromium_src-9793803ad5cb6e3603d815c60d58c6797f562ec4.tar.bz2 | |
Fixed: Sample Proxy Extension did not load the persisted settings properly
TBR=mkwst@chromium.org
BUG=79577
TEST=Set proxy-settings with extension, reload the extension, see that error messages do not appear again
Review URL: http://codereview.chromium.org/6864012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81748 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/extensions/docs/examples/extensions/proxy_configuration.zip | bin | 107413 -> 144472 bytes | |||
| -rw-r--r-- | chrome/common/extensions/docs/examples/extensions/proxy_configuration/background.html | 3 | ||||
| -rw-r--r-- | chrome/common/extensions/docs/samples.json | 2 |
3 files changed, 3 insertions, 2 deletions
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 8f95e28..5b7cb0a 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 4c4fccb..870c505 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,8 @@ // incognito settings are wiped on restart. var persistedSettings = ProxyFormController.getPersistedSettings(); if (persistedSettings !== null) { - chrome.experimental.proxy.settings.set({'value': persistedSettings}); + chrome.experimental.proxy.settings.set( + {'value': persistedSettings.regular}); } </script> </body> diff --git a/chrome/common/extensions/docs/samples.json b/chrome/common/extensions/docs/samples.json index 6a0adf8..d47a40e 100644 --- a/chrome/common/extensions/docs/samples.json +++ b/chrome/common/extensions/docs/samples.json @@ -1448,7 +1448,7 @@ "test/proxy_form_controller_test.js", "test/unittest.css" ], - "source_hash": "3565d99743a1f7579d91174cb77f9ff2c189c37c", + "source_hash": "8f6768d78649cc4e69e595e7e43b3f06431c84e0", "zip_path": "examples/extensions/proxy_configuration.zip" }, { |