NetworkConnect::Delegate: service_path -> network_id

chrome/browser/ui/ash/system_tray_client.cc

 // Copyright 2016 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/system_tray_client.h"
 
 #include "ash/common/login_status.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/public/cpp/shell_window_ids.h"
@@ skipping 179 matching lines @@
   content::RecordAction(base::UserMetricsAction("ShowPaletteOptions"));
   ShowSettingsSubPageForActiveUser(kPaletteSettingsSubPageName);
 }
 
 void SystemTrayClient::ShowPublicAccountInfo() {
   chrome::ScopedTabbedBrowserDisplayer displayer(
       ProfileManager::GetActiveUserProfile());
   chrome::ShowPolicy(displayer.browser());
 }
 
-void SystemTrayClient::ShowNetworkConfigure(const std::string& service_path) {
+void SystemTrayClient::ShowNetworkConfigure(const std::string& network_id) {
   // TODO(jamescook): Consolidate this with the classic ash version from
   // NetworkConnectDelegateChromeOS. This will require moving the window
   // container calculation to this class, then plumbing a container ID through
   // the dialog code.
   CHECK(chrome::IsRunningInMash());
-  chromeos::NetworkConfigView::Show(service_path, nullptr /* parent */);
+  chromeos::NetworkConfigView::ShowByNetworkId(network_id,
+                                               nullptr /* parent */);
 }
 
 void SystemTrayClient::ShowNetworkSettings(const std::string& network_id) {
   if (!chrome::IsRunningInMash()) {
     // TODO(mash): Need replacement for SessionStateDelegate. crbug.com/648964
     if (!LoginState::Get()->IsUserLoggedIn() ||
         ash::WmShell::Get()
             ->GetSessionStateDelegate()
             ->IsInSecondaryLoginScreen())
       return;
@@ skipping 37 matching lines @@
     connector->ConnectToInterface("service:content_browser", &system_tray_);
 
   // Tolerate ash crashing and coming back up.
   system_tray_.set_connection_error_handler(base::Bind(
       &SystemTrayClient::OnClientConnectionError, base::Unretained(this)));
 }
 
 void SystemTrayClient::OnClientConnectionError() {
   system_tray_.reset();
 }