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 86 matching lines @@
       return ash::LoginStatus::SUPERVISED;
     case LoginState::LOGGED_IN_USER_KIOSK_APP:
       return ash::LoginStatus::KIOSK_APP;
   }
   NOTREACHED();
   return ash::LoginStatus::NOT_LOGGED_IN;
 }
 
 // static
 int SystemTrayClient::GetDialogParentContainerId() {
+  const ash::LoginStatus login_status = GetUserLoginStatus();
+  if (login_status == ash::LoginStatus::NOT_LOGGED_IN ||
+      login_status == ash::LoginStatus::LOCKED)
+    return ash::kShellWindowId_LockSystemModalContainer;

[stevenjb, 2016/10/20 19:42:40]

nit: {}

[James Cook, 2016/10/20 20:10:34]

Done.

+
   // TODO(mash): Need replacement for SessionStateDelegate. crbug.com/648964
   if (chrome::IsRunningInMash())
     return ash::kShellWindowId_SystemModalContainer;
 
   ash::WmShell* wm_shell = ash::WmShell::Get();
   const bool session_started =
       wm_shell->GetSessionStateDelegate()->IsActiveUserSessionStarted();
-  const ash::LoginStatus login_status = GetUserLoginStatus();
   const bool is_in_secondary_login_screen =
       wm_shell->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
 
-  if (!session_started || login_status == ash::LoginStatus::NOT_LOGGED_IN ||
-      login_status == ash::LoginStatus::LOCKED || is_in_secondary_login_screen)
+  if (!session_started || is_in_secondary_login_screen)
     return ash::kShellWindowId_LockSystemModalContainer;
 
   return ash::kShellWindowId_SystemModalContainer;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ash::mojom::SystemTrayClient:
 
 void SystemTrayClient::ShowSettings() {
   ShowSettingsSubPageForActiveUser(std::string());
@@ skipping 61 matching lines @@
   ShowSettingsSubPageForActiveUser(kPaletteSettingsSubPageName);
 }
 
 void SystemTrayClient::ShowPublicAccountInfo() {
   chrome::ScopedTabbedBrowserDisplayer displayer(
       ProfileManager::GetActiveUserProfile());
   chrome::ShowPolicy(displayer.browser());
 }
 
 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());
+  // 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;

[stevenjb, 2016/10/20 19:42:40]

{}

[James Cook, 2016/10/20 20:10:34]

Done.

+
+  // Dialog will default to the primary display.
   chromeos::NetworkConfigView::ShowByNetworkId(network_id,
-                                               nullptr /* parent */);
+                                               GetDialogParentContainerId());
 }
 
 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();
 }