chromeos: Make network enrollment and SIM unlock dialogs work 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/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"
+#include "ash/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/set_time_dialog.h"
 #include "chrome/browser/chromeos/system/system_clock.h"
 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.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 "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 "services/ui/public/cpp/property_type_converters.h"
+#include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "third_party/cros_system_api/dbus/shill/dbus-constants.h"
+#include "ui/views/widget/widget.h"
+#include "ui/views/window/dialog_delegate.h"
 
 using chromeos::DBusThreadManager;
 using chromeos::LoginState;
+using views::Widget;
 
 namespace {
 
 const char kDisplaySettingsSubPageName[] = "display";
 const char kPaletteSettingsSubPageName[] = "stylus-overlay";
 
 SystemTrayClient* g_instance = nullptr;
 
 void ShowSettingsSubPageForActiveUser(const std::string& sub_page) {
   chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(),
@@ skipping 73 matching lines @@
       wm_shell->GetSessionStateDelegate()->IsActiveUserSessionStarted();
   const bool is_in_secondary_login_screen =
       wm_shell->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
 
   if (!session_started || is_in_secondary_login_screen)
     return ash::kShellWindowId_LockSystemModalContainer;
 
   return ash::kShellWindowId_SystemModalContainer;
 }
 
+// static
+Widget* SystemTrayClient::CreateUnownedDialogWidget(
+    views::WidgetDelegate* widget_delegate) {
+  DCHECK(widget_delegate);
+  Widget::InitParams params = views::DialogDelegate::GetDialogWidgetInitParams(
+      widget_delegate, nullptr, nullptr, gfx::Rect());
+  // Place the dialog in the appropriate modal dialog container, either above
+  // or below the lock screen, based on the login state.
+  int container_id = GetDialogParentContainerId();
+  if (chrome::IsRunningInMash()) {
+    using ui::mojom::WindowManager;
+    params.mus_properties[WindowManager::kInitialContainerId_Property] =
+        mojo::ConvertTo<std::vector<uint8_t>>(container_id);
+  } else {
+    params.parent = ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
+                                             container_id);
+  }
+  Widget* widget = new Widget;  // Owned by native widget.
+  widget->Init(params);
+  return widget;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ash::mojom::SystemTrayClient:
 
 void SystemTrayClient::ShowSettings() {
   ShowSettingsSubPageForActiveUser(std::string());
 }
 
 void SystemTrayClient::ShowDateSettings() {
   content::RecordAction(base::UserMetricsAction("ShowDateOptions"));
   // Everybody can change the time zone (even though it is a device setting).
@@ skipping 130 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();
 }