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

Unified Diff: ui/chromeos/network/network_state_notifier.cc

Issue 983823002: Use GUID instead of servicePath in network settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_430115_internet_options_enable_extension_apis
Patch Set: Use guid instead of service_path for proxy prefs Created 5 years, 9 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: ui/chromeos/network/network_state_notifier.cc
diff --git a/ui/chromeos/network/network_state_notifier.cc b/ui/chromeos/network/network_state_notifier.cc
index 0cfde4aa26332a657912879ac21de557dd3e09b0..54245a098ecb258939a1499b2d5dd3cd6e277e89 100644
--- a/ui/chromeos/network/network_state_notifier.cc
+++ b/ui/chromeos/network/network_state_notifier.cc
@@ -184,7 +184,7 @@ void NetworkStateNotifier::UpdateCellularOutOfCredits(
ShowErrorNotification(
kNetworkOutOfCreditsNotificationId, cellular->type(),
l10n_util::GetStringUTF16(IDS_NETWORK_OUT_OF_CREDITS_TITLE), error_msg,
- base::Bind(&NetworkStateNotifier::ShowNetworkSettings,
+ base::Bind(&NetworkStateNotifier::ShowNetworkSettingsForPath,
weak_ptr_factory_.GetWeakPtr(), cellular->path()));
}
}
@@ -218,7 +218,7 @@ void NetworkStateNotifier::UpdateCellularActivating(
l10n_util::GetStringFUTF16(IDS_NETWORK_CELLULAR_ACTIVATED,
base::UTF8ToUTF16((cellular->name()))),
icon, kNotifierNetwork,
- base::Bind(&NetworkStateNotifier::ShowNetworkSettings,
+ base::Bind(&NetworkStateNotifier::ShowNetworkSettingsForPath,
weak_ptr_factory_.GetWeakPtr(), cellular->path())));
}
@@ -258,7 +258,7 @@ void NetworkStateNotifier::ShowMobileActivationError(
ui::ResourceBundle::GetSharedInstance().GetImageNamed(
IDR_AURA_UBER_TRAY_NETWORK_FAILED_CELLULAR),
kNotifierNetworkError,
- base::Bind(&NetworkStateNotifier::ShowNetworkSettings,
+ base::Bind(&NetworkStateNotifier::ShowNetworkSettingsForPath,
weak_ptr_factory_.GetWeakPtr(), service_path)));
}
@@ -371,13 +371,13 @@ void NetworkStateNotifier::ShowConnectErrorNotification(
ShowErrorNotification(
kNetworkConnectNotificationId, network_type,
l10n_util::GetStringUTF16(IDS_NETWORK_CONNECTION_ERROR_TITLE), error_msg,
- base::Bind(&NetworkStateNotifier::ShowNetworkSettings,
+ base::Bind(&NetworkStateNotifier::ShowNetworkSettingsForPath,
weak_ptr_factory_.GetWeakPtr(), service_path));
}
-void NetworkStateNotifier::ShowNetworkSettings(
+void NetworkStateNotifier::ShowNetworkSettingsForPath(
const std::string& service_path) {
- network_connect_->ShowNetworkSettings(service_path);
+ network_connect_->ShowNetworkSettingsForPath(service_path);
}
} // namespace ui
« no previous file with comments | « ui/chromeos/network/network_state_notifier.h ('k') | ui/chromeos/network/network_state_notifier_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698