mash: Place views Wi-Fi network config dialogs in correct window parent

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 14 matching lines @@
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/login/login_state.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/service_manager_connection.h"
 #include "net/base/escape.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/views/widget/widget_parent.h"
 
 using chromeos::DBusThreadManager;
 using chromeos::LoginState;
 
 namespace {
 
 const char kDisplaySettingsSubPageName[] = "display";
 const char kPaletteSettingsSubPageName[] = "stylus-overlay";
 
 SystemTrayClient* g_instance = nullptr;
@@ skipping 146 matching lines @@
   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 */);
+  // UI is not available at the lock screen.
+  // TODO(mash): Need replacement for SessionStateDelegate. crbug.com/648964
+  if (!chrome::IsRunningInMash() &&
+      ash::WmShell::Get()->GetSessionStateDelegate()->IsScreenLocked())
+    return;
+
+  views::WidgetParent parent;
+  parent.container_id = GetDialogParentContainerId();
+  // Dialog will default to the primary display.
+  chromeos::NetworkConfigView::Show(service_path, 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();
 }