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

Unified Diff: ash/common/system/chromeos/network/network_state_list_detailed_view.cc

Issue 2698473007: Convert path usage in NetworkListViewBase subclasses to use guids. (Closed)
Patch Set: Formatting. Created 3 years, 10 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: ash/common/system/chromeos/network/network_state_list_detailed_view.cc
diff --git a/ash/common/system/chromeos/network/network_state_list_detailed_view.cc b/ash/common/system/chromeos/network/network_state_list_detailed_view.cc
index 3a5ce73eb6d51793b15ab0a0712134daca5daf5e..43d1c03f81e72486592235bfbb727ce031cb1346 100644
--- a/ash/common/system/chromeos/network/network_state_list_detailed_view.cc
+++ b/ash/common/system/chromeos/network/network_state_list_detailed_view.cc
@@ -402,13 +402,13 @@ void NetworkStateListDetailedView::HandleViewClicked(views::View* view) {
if (login_ == LoginStatus::LOCKED)
return;
- std::string service_path;
- if (!network_list_view_->IsNetworkEntry(view, &service_path))
+ std::string guid;
+ if (!network_list_view_->IsNetworkEntry(view, &guid))
return;
const NetworkState* network =
- NetworkHandler::Get()->network_state_handler()->GetNetworkState(
- service_path);
+ NetworkHandler::Get()->network_state_handler()->GetNetworkStateFromGuid(
+ guid);
if (!network || network->IsConnectedState() || network->IsConnectingState()) {
WmShell::Get()->RecordUserMetricsAction(
list_type_ == LIST_TYPE_VPN
@@ -643,8 +643,8 @@ views::View* NetworkStateListDetailedView::CreateControlledByExtensionView(
if (!networking_config_delegate)
return nullptr;
std::unique_ptr<const NetworkingConfigDelegate::ExtensionInfo>
- extension_info = networking_config_delegate->LookUpExtensionForNetwork(
- info.service_path);
+ extension_info =
+ networking_config_delegate->LookUpExtensionForNetwork(info.guid);
stevenjb 2017/02/16 22:40:31 This delegate function needs to be modified to acc
Ryan Hansberry 2017/02/16 23:14:18 Thankfully this was the only place that calls this
if (!extension_info)
return nullptr;

Powered by Google App Engine
This is Rietveld 408576698