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

Unified Diff: ash/system/chromeos/network/network_state_list_detailed_view.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
« no previous file with comments | « no previous file | ash/system/tray/system_tray_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/network/network_state_list_detailed_view.cc
diff --git a/ash/system/chromeos/network/network_state_list_detailed_view.cc b/ash/system/chromeos/network/network_state_list_detailed_view.cc
index 39d466cf5dd71ad7da8d0df8e7e46ca6af4761a6..a820db6e1e640f985a4961c9c871fc1d5dd1ece0 100644
--- a/ash/system/chromeos/network/network_state_list_detailed_view.cc
+++ b/ash/system/chromeos/network/network_state_list_detailed_view.cc
@@ -209,7 +209,7 @@ void NetworkStateListDetailedView::ButtonPressed(views::Button* sender,
list_type_ == LIST_TYPE_VPN
? ash::UMA_STATUS_AREA_VPN_SETTINGS_CLICKED
: ash::UMA_STATUS_AREA_NETWORK_SETTINGS_CLICKED);
- delegate->ShowNetworkSettings("");
+ delegate->ShowNetworkSettingsForGuid("");
} else if (sender == proxy_settings_) {
delegate->ChangeProxySettings();
} else if (sender == other_mobile_) {
@@ -251,8 +251,8 @@ void NetworkStateListDetailedView::OnViewClicked(views::View* sender) {
list_type_ == LIST_TYPE_VPN
? ash::UMA_STATUS_AREA_SHOW_NETWORK_CONNECTION_DETAILS
: ash::UMA_STATUS_AREA_SHOW_VPN_CONNECTION_DETAILS);
- Shell::GetInstance()->system_tray_delegate()->ShowNetworkSettings(
- service_path);
+ Shell::GetInstance()->system_tray_delegate()->ShowNetworkSettingsForGuid(
+ network ? network->guid() : "");
} else {
Shell::GetInstance()->metrics()->RecordUserMetricsAction(
list_type_ == LIST_TYPE_VPN
« no previous file with comments | « no previous file | ash/system/tray/system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698