Use GUID instead of servicePath in network settings

ui/chromeos/network/network_state_notifier.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/chromeos/network/network_state_notifier.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
@@ skipping 166 matching lines @@
 
   did_show_out_of_credits_ = true;
   base::TimeDelta dtime = base::Time::Now() - out_of_credits_notify_time_;
   if (dtime.InSeconds() > kMinTimeBetweenOutOfCreditsNotifySeconds) {
     out_of_credits_notify_time_ = base::Time::Now();
     base::string16 error_msg = l10n_util::GetStringFUTF16(
         IDS_NETWORK_OUT_OF_CREDITS_BODY, base::UTF8ToUTF16(cellular->name()));
     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()));
   }
 }
 
 void NetworkStateNotifier::UpdateCellularActivating(
     const NetworkState* cellular) {
   // Keep track of any activating cellular network.
   std::string activation_state = cellular->activation_state();
   if (activation_state == shill::kActivationStateActivating) {
     cellular_activating_.insert(cellular->path());
@@ skipping 13 matching lines @@
     icon_id = IDR_AURA_UBER_TRAY_NOTIFICATION_3G;
   const gfx::Image& icon =
       ui::ResourceBundle::GetSharedInstance().GetImageNamed(icon_id);
   message_center::MessageCenter::Get()->AddNotification(
       message_center::Notification::CreateSystemNotification(
           kNetworkActivateNotificationId,
           l10n_util::GetStringUTF16(IDS_NETWORK_CELLULAR_ACTIVATED_TITLE),
           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())));
 }
 
 void NetworkStateNotifier::ShowNetworkConnectError(
     const std::string& error_name,
     const std::string& service_path) {
   if (service_path.empty()) {
     base::DictionaryValue shill_properties;
     ShowConnectErrorNotification(error_name, service_path, shill_properties);
     return;
@@ skipping 19 matching lines @@
   }
   message_center::MessageCenter::Get()->AddNotification(
       message_center::Notification::CreateSystemNotification(
           kNetworkActivateNotificationId,
           l10n_util::GetStringUTF16(IDS_NETWORK_ACTIVATION_ERROR_TITLE),
           l10n_util::GetStringFUTF16(IDS_NETWORK_ACTIVATION_NEEDS_CONNECTION,
                                      base::UTF8ToUTF16(cellular->name())),
           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)));
 }
 
 void NetworkStateNotifier::RemoveConnectNotification() {
   message_center::MessageCenter* message_center =
       message_center::MessageCenter::Get();
   if (message_center) {
     message_center->RemoveNotification(kNetworkConnectNotificationId,
                                        false /* not by user */);
   }
@@ skipping 92 matching lines @@
                                    base::UTF8ToUTF16(network_name), error);
   }
 
   std::string network_type;
   shill_properties.GetStringWithoutPathExpansion(shill::kTypeProperty,
                                                  &network_type);
 
   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