NetworkConnect::Delegate: service_path -> network_id

chrome/browser/ui/webui/chromeos/mobile_setup_dialog.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 "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/browser/chromeos/mobile/mobile_activator.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
+#include "chromeos/network/network_state.h"
+#include "chromeos/network/network_state_handler.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/widget/widget.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
 
 using chromeos::MobileActivator;
 using content::BrowserThread;
 using content::WebContents;
 using content::WebUIMessageHandler;
@@ skipping 26 matching lines @@
   bool HandleContextMenu(const content::ContextMenuParams& params) override;
 
  private:
   gfx::NativeWindow dialog_window_;
   // Cellular network service path.
   std::string service_path_;
   DISALLOW_COPY_AND_ASSIGN(MobileSetupDialogDelegate);
 };
 
 // static
-void MobileSetupDialog::Show(const std::string& service_path) {
+void MobileSetupDialog::ShowByNetworkId(const std::string& network_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  MobileSetupDialogDelegate::GetInstance()->ShowDialog(service_path);
+  const chromeos::NetworkState* network =
+      chromeos::NetworkHandler::Get()
+          ->network_state_handler()
+          ->GetNetworkStateFromGuid(network_id);
+  if (!network) {
+    LOG(ERROR) << "MobileSetupDialog: Network ID not found: " << network_id;
+    return;
+  }
+  MobileSetupDialogDelegate::GetInstance()->ShowDialog(network->path());
 }
 
 // static
 MobileSetupDialogDelegate* MobileSetupDialogDelegate::GetInstance() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return base::Singleton<MobileSetupDialogDelegate>::get();
 }
 
 MobileSetupDialogDelegate::MobileSetupDialogDelegate()
     : dialog_window_(nullptr) {}
@@ skipping 68 matching lines @@
 }
 
 bool MobileSetupDialogDelegate::ShouldShowDialogTitle() const {
   return true;
 }
 
 bool MobileSetupDialogDelegate::HandleContextMenu(
     const content::ContextMenuParams& params) {
   return true;
 }