NetworkConnect::Delegate: service_path -> network_id

chrome/browser/ui/ash/network_connect_delegate_chromeos.cc

 // Copyright 2014 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 "chrome/browser/ui/ash/network_connect_delegate_chromeos.h"
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
@@ skipping 12 matching lines @@
 gfx::NativeWindow GetNativeWindow() {
   int container_id = SystemTrayClient::GetDialogParentContainerId();
   return ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
                                   container_id);
 }
 
 }  // namespace
 
 namespace chromeos {
 
-NetworkConnectDelegateChromeOS::NetworkConnectDelegateChromeOS() {
-}
+NetworkConnectDelegateChromeOS::NetworkConnectDelegateChromeOS() {}
 
-NetworkConnectDelegateChromeOS::~NetworkConnectDelegateChromeOS() {
-}
+NetworkConnectDelegateChromeOS::~NetworkConnectDelegateChromeOS() {}
 
 void NetworkConnectDelegateChromeOS::ShowNetworkConfigure(
     const std::string& network_id) {
   if (!IsUIAvailable())
     return;
-  NetworkConfigView::Show(network_id, GetNativeWindow());
+  NetworkConfigView::ShowByNetworkId(network_id, GetNativeWindow());
 }
 
-void NetworkConnectDelegateChromeOS::ShowNetworkSettingsForGuid(
+void NetworkConnectDelegateChromeOS::ShowNetworkSettings(
     const std::string& network_id) {
   if (!IsUIAvailable())
     return;
   SystemTrayClient::Get()->ShowNetworkSettings(network_id);
 }
 
 bool NetworkConnectDelegateChromeOS::ShowEnrollNetwork(
     const std::string& network_id) {
   if (!IsUIAvailable())
     return false;
   return enrollment::CreateDialog(network_id, GetNativeWindow());
 }
 
 void NetworkConnectDelegateChromeOS::ShowMobileSimDialog() {
   if (!IsUIAvailable())
     return;
   SimDialogDelegate::ShowDialog(GetNativeWindow(),
                                 SimDialogDelegate::SIM_DIALOG_UNLOCK);
 }
 
 void NetworkConnectDelegateChromeOS::ShowMobileSetupDialog(
-    const std::string& service_path) {
+    const std::string& network_id) {
   if (!IsUIAvailable())
     return;
-  MobileSetupDialog::Show(service_path);
+  MobileSetupDialog::ShowByNetworkId(network_id);
 }
 
 }  // namespace chromeos