Chromium Code Reviews| Index: extensions/browser/api/networking_private/networking_private_api.cc |
| diff --git a/extensions/browser/api/networking_private/networking_private_api.cc b/extensions/browser/api/networking_private/networking_private_api.cc |
| index d887a397311eabb6f3ff3af9b574eb218e557a8b..e99b5fb5965e737a5d6754a1682de90392df5798 100644 |
| --- a/extensions/browser/api/networking_private/networking_private_api.cc |
| +++ b/extensions/browser/api/networking_private/networking_private_api.cc |
| @@ -586,7 +586,8 @@ ExtensionFunction::ResponseAction NetworkingPrivateStartConnectFunction::Run() { |
| ->StartConnect( |
| params->network_guid, |
| base::Bind(&NetworkingPrivateStartConnectFunction::Success, this), |
| - base::Bind(&NetworkingPrivateStartConnectFunction::Failure, this)); |
| + base::Bind(&NetworkingPrivateStartConnectFunction::Failure, this, |
| + params->network_guid)); |
| // Success() or Failure() might have been called synchronously at this point. |
| // In that case this function has already called Respond(). Return |
| // AlreadyResponded() in that case. |
| @@ -597,7 +598,19 @@ void NetworkingPrivateStartConnectFunction::Success() { |
| Respond(NoArguments()); |
| } |
| -void NetworkingPrivateStartConnectFunction::Failure(const std::string& error) { |
| +void NetworkingPrivateStartConnectFunction::Failure(const std::string& guid, |
| + const std::string& error) { |
| + // TODO(stevenjb): Temporary workaround to show the configuration UI. |
| + // Eventually the caller (e.g. Settings) should handle any failures and |
| + // show its own configuration UI. crbug.com/380937. |
| + if (source_context_type() == Feature::WEBUI_CONTEXT) { |
|
stevenjb
2017/04/12 18:14:57
This seems fine, but I am unfamiliar with the code
tbarzic
2017/04/12 18:50:36
this checks whether startConnect function was call
|
| + const NetworkingPrivateDelegate::UIDelegate* ui_delegate = |
| + GetDelegate(browser_context())->ui_delegate(); |
| + if (ui_delegate && ui_delegate->HandleConnectFailed(guid, error)) { |
| + Success(); |
| + return; |
| + } |
| + } |
|
stevenjb
2017/04/12 18:14:57
Did you verify that the dialog shows up on connect
tbarzic
2017/04/12 18:50:36
yes I have
|
| Respond(Error(error)); |
| } |