Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3358)

Unified Diff: extensions/browser/api/networking_private/networking_private_chromeos.cc

Issue 2814023002: Don't show network config UI when networkingPrivate.startConenct fails (Closed)
Patch Set: . Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/browser/api/networking_private/networking_private_chromeos.cc
diff --git a/extensions/browser/api/networking_private/networking_private_chromeos.cc b/extensions/browser/api/networking_private/networking_private_chromeos.cc
index 58d4494764914513ccdfac71c7c300c6ed8437b5..93d4103ebdee711896f7d62dc276c7551bdea8b4 100644
--- a/extensions/browser/api/networking_private/networking_private_chromeos.cc
+++ b/extensions/browser/api/networking_private/networking_private_chromeos.cc
@@ -536,9 +536,7 @@ void NetworkingPrivateChromeOS::StartConnect(
const bool check_error_state = false;
NetworkHandler::Get()->network_connection_handler()->ConnectToNetwork(
service_path, success_callback,
- base::Bind(&NetworkingPrivateChromeOS::ConnectFailureCallback,
- weak_ptr_factory_.GetWeakPtr(), guid, success_callback,
- failure_callback),
+ base::Bind(&NetworkHandlerFailureCallback, failure_callback),
check_error_state);
}
@@ -884,20 +882,4 @@ void NetworkingPrivateChromeOS::SetManagedActiveProxyValues(
VLOG(2) << " NEW PROXY: " << *proxy_settings;
}
-void NetworkingPrivateChromeOS::ConnectFailureCallback(
- const std::string& guid,
- const VoidCallback& success_callback,
- const FailureCallback& failure_callback,
- const std::string& error_name,
- std::unique_ptr<base::DictionaryValue> error_data) {
- // 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 (ui_delegate()->HandleConnectFailed(guid, error_name)) {
- success_callback.Run();
- return;
- }
- failure_callback.Run(error_name);
-}
-
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698