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/login_status.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/chromeos/sim_dialog_delegate.h"
 #include "chrome/browser/ui/ash/system_tray_client.h"
 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
+#include "chromeos/network/network_handler.h"
+#include "chromeos/network/network_state.h"
+#include "chromeos/network/network_state_handler.h"
+
+namespace chromeos {
 
 namespace {
 
 bool IsUIAvailable() {
   return ash::WmShell::HasInstance() &&
          !ash::WmShell::Get()->GetSessionStateDelegate()->IsScreenLocked();
 }
 
 gfx::NativeWindow GetNativeWindow() {
   ash::WmShell* wm_shell = ash::WmShell::Get();
   const bool session_started =
       wm_shell->GetSessionStateDelegate()->IsActiveUserSessionStarted();
   const ash::LoginStatus login_status =
       wm_shell->system_tray_delegate()->GetUserLoginStatus();
   const bool is_in_secondary_login_screen =
       wm_shell->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
 
   int container_id =

[James Cook, 2016/10/18 23:26:25]

You may need to sync/rebase -- most of this function is gone in ToT.

[stevenjb, 2016/10/19 17:06:44]

Done.

       (!session_started || login_status == ash::LoginStatus::NOT_LOGGED_IN ||
        login_status == ash::LoginStatus::LOCKED || is_in_secondary_login_screen)
           ? ash::kShellWindowId_LockSystemModalContainer
           : ash::kShellWindowId_SystemModalContainer;
   return ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
                                   container_id);
 }
 
+std::string GetServicePathFromNetworkId(const std::string& network_id) {

[James Cook, 2016/10/18 23:26:25]

Can you put this in a static function in SystemTrayClient then call it from both
places?

[stevenjb, 2016/10/19 17:06:44]

Moved to the dialog code.

+  const NetworkState* network =
+      NetworkHandler::Get()->network_state_handler()->GetNetworkStateFromGuid(
+          network_id);
+  if (!network) {
+    LOG(ERROR) << "Network ID not found: " << network_id;
+    return "";

[James Cook, 2016/10/18 23:26:25]

nit: std::string()

[stevenjb, 2016/10/19 17:06:44]

Acknowledged.

+  }
+  return network->path();
+}
+
 }  // 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());
+  std::string service_path = GetServicePathFromNetworkId(network_id);
+  if (service_path.empty())
+    return;
+  NetworkConfigView::Show(service_path, GetNativeWindow());
 }
 
 void NetworkConnectDelegateChromeOS::ShowNetworkSettingsForGuid(
     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;
+  std::string service_path = GetServicePathFromNetworkId(network_id);
+  if (service_path.empty())
+    return;
   MobileSetupDialog::Show(service_path);
 }
 
 }  // namespace chromeos