chromeos: Refactor system tray Wi-Fi connect dialog so it works with mash

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/session/session_state_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
+#include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/chromeos/system/system_clock.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/login/login_state.h"
 #include "content/public/browser/user_metrics.h"
@@ skipping 107 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) {
+  // 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 */);
+}
+
 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 35 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();
 }