| Index: chrome/browser/extensions/extension_proxy_api.cc
|
| diff --git a/chrome/browser/extensions/extension_proxy_api.cc b/chrome/browser/extensions/extension_proxy_api.cc
|
| index bc439eb11ef565a1877cf61de7cd599957f3609d..89e3c65622224ad3223e0cc4fc42f7a96162b0d3 100644
|
| --- a/chrome/browser/extensions/extension_proxy_api.cc
|
| +++ b/chrome/browser/extensions/extension_proxy_api.cc
|
| @@ -12,7 +12,7 @@
|
| #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 +123,8 @@ ExtensionProxyEventRouter::~ExtensionProxyEventRouter() {
|
| }
|
|
|
| void ExtensionProxyEventRouter::OnProxyError(
|
| - const ExtensionIOEventRouter* event_router,
|
| + ExtensionEventRouterForwarder* event_router,
|
| + Profile* profile,
|
| int error_code) {
|
| ListValue args;
|
| DictionaryValue* dict = new DictionaryValue();
|
| @@ -134,8 +135,14 @@ void ExtensionProxyEventRouter::OnProxyError(
|
|
|
| std::string json_args;
|
| base::JSONWriter::Write(&args, false, &json_args);
|
| - event_router->DispatchEventToRenderers(
|
| - kProxyEventOnProxyError, json_args, GURL());
|
| +
|
| + if (profile) {
|
| + event_router->DispatchEventToRenderers(
|
| + kProxyEventOnProxyError, json_args, profile, true, GURL());
|
| + } else {
|
| + event_router->BroadcastEventToRenderers(
|
| + kProxyEventOnProxyError, json_args, GURL());
|
| + }
|
| }
|
|
|
| bool SetProxySettingsFunction::GetProxyServer(
|
|
|