diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-01 12:01:15 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-01 12:01:15 +0000 |
| commit | 3ce02419d4f7b3cd1fc062f87fb63a78072b5483 (patch) | |
| tree | 6bdbb2cc363827fe8fb6186d5cbf5787f5aaf29d /chrome/browser/extensions/extension_proxy_api.cc | |
| parent | af3f286560a8fadb4eb6cb51c7ba2cb0f8e17a66 (diff) | |
| download | chromium_src-3ce02419d4f7b3cd1fc062f87fb63a78072b5483.zip chromium_src-3ce02419d4f7b3cd1fc062f87fb63a78072b5483.tar.gz chromium_src-3ce02419d4f7b3cd1fc062f87fb63a78072b5483.tar.bz2 | |
Make the ChromeNetworkDelegate use the ExtensionEventRouterForwarder
BUG=73903
TEST=tests for proxy and webrequest API should still work
Review URL: http://codereview.chromium.org/6598002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76372 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_proxy_api.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_proxy_api.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extension_proxy_api.cc b/chrome/browser/extensions/extension_proxy_api.cc index bc439eb..d4ed2f9 100644 --- a/chrome/browser/extensions/extension_proxy_api.cc +++ b/chrome/browser/extensions/extension_proxy_api.cc @@ -11,8 +11,7 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/prefs/proxy_config_dictionary.h" -#include "chrome/browser/profiles/profile.h" -#include "chrome/browser/extensions/extension_io_event_router.h" +#include "chrome/browser/extensions/extension_event_router_forwarder.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/common/extensions/extension_error_utils.h" #include "chrome/common/pref_names.h" @@ -123,7 +122,8 @@ ExtensionProxyEventRouter::~ExtensionProxyEventRouter() { } void ExtensionProxyEventRouter::OnProxyError( - const ExtensionIOEventRouter* event_router, + ExtensionEventRouterForwarder* event_router, + ProfileId profile_id, int error_code) { ListValue args; DictionaryValue* dict = new DictionaryValue(); @@ -134,8 +134,14 @@ void ExtensionProxyEventRouter::OnProxyError( std::string json_args; base::JSONWriter::Write(&args, false, &json_args); - event_router->DispatchEventToRenderers( - kProxyEventOnProxyError, json_args, GURL()); + + if (profile_id != Profile::kInvalidProfileId) { + event_router->DispatchEventToRenderers( + kProxyEventOnProxyError, json_args, profile_id, true, GURL()); + } else { + event_router->BroadcastEventToRenderers( + kProxyEventOnProxyError, json_args, GURL()); + } } bool SetProxySettingsFunction::GetProxyServer( |