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

Unified Diff: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

Issue 607613002: Elim parent_window parameter from network_connect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Elim includes Created 6 years, 3 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
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
index e4d730a95c02ae3c5022788ae79601d3fcccd64d..cba021148d39ce0317e6817f0dc5e8386fa701c7 100644
--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
@@ -290,12 +290,10 @@ bool AddIntegerPropertyIfChanged(const std::string& key,
return false;
}
-void RequestReconnect(const std::string& service_path,
- gfx::NativeWindow owning_window) {
+void RequestReconnect(const std::string& service_path) {
NetworkHandler::Get()->network_connection_handler()->DisconnectNetwork(
service_path,
- base::Bind(&ash::network_connect::ConnectToNetwork,
- service_path, owning_window),
+ base::Bind(&ash::network_connect::ConnectToNetwork, service_path),
base::Bind(&ShillError, "RequestReconnect"));
}
@@ -595,7 +593,7 @@ void InternetOptionsHandler::StartConnectCallback(const base::ListValue* args) {
NOTREACHED();
return;
}
- ash::network_connect::ConnectToNetwork(service_path, GetNativeWindow());
+ ash::network_connect::ConnectToNetwork(service_path);
}
void InternetOptionsHandler::StartDisconnectCallback(
@@ -833,7 +831,7 @@ void InternetOptionsHandler::SetIPConfigProperties(
// If auto config or a static IP property changed, we need to reconnect
// to the network.
if (request_reconnect)
- callback = base::Bind(&RequestReconnect, service_path, GetNativeWindow());
+ callback = base::Bind(&RequestReconnect, service_path);
NetworkHandler::Get()->network_device_handler()->RequestRefreshIPConfigs(
device_path,
callback,
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698