chromeos: Make network enrollment and SIM unlock dialogs work with mash

chrome/browser/chromeos/enrollment_dialog_view.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/chromeos/enrollment_dialog_view.h"
 
+#include "ash/shell.h"
 #include "base/bind.h"
+#include "base/callback.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/ash/ash_util.h"
+#include "chrome/browser/ui/ash/system_tray_client.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/network/client_cert_util.h"
 #include "chromeos/network/managed_network_configuration_handler.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/common/constants.h"
+#include "services/ui/public/cpp/property_type_converters.h"
+#include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/page_transition_types.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
+using views::Widget;
+
 namespace chromeos {
 
 namespace {
 
 // Default width/height of the dialog.
 const int kDefaultWidth = 350;
 const int kDefaultHeight = 100;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Dialog for certificate enrollment. This displays the content from the
@@ skipping 54 matching lines @@
 }
 
 // static
 void EnrollmentDialogView::ShowDialog(gfx::NativeWindow owning_window,
                                       const std::string& network_name,
                                       Profile* profile,
                                       const GURL& target_uri,
                                       const base::Closure& connect) {
   EnrollmentDialogView* dialog_view =
       new EnrollmentDialogView(network_name, profile, target_uri, connect);
-  views::DialogDelegate::CreateDialogWidget(dialog_view, NULL, owning_window);
+  if (owning_window) {
+    views::DialogDelegate::CreateDialogWidget(dialog_view, nullptr,
+                                              owning_window);
+  } else {
+    // Place the dialog in the appropriate modal dialog container, either above
+    // or below the lock screen, based on the login state.
+    Widget::InitParams params = DialogDelegate::GetDialogWidgetInitParams(
+        dialog_view, nullptr, nullptr, gfx::Rect());
+    int container_id = SystemTrayClient::GetDialogParentContainerId();

[James Cook, 2016/10/27 18:20:37]

As I noted in the last CL: I would like to move GetDialogParentContainerId() to
a utility file, but that would require moving GetUserLoginState() as well, and
I'd prefer to wait on that until the login service is better defined.

[stevenjb, 2016/10/27 18:45:13]

The added dependencies are somewhat unfortunate.

Would it be reasonable to put this into SystemTrayClient for now instead, e.g.
SystemTrayClient::CreateUnownedDialogWidget()?

[James Cook, 2016/10/27 22:28:27]

Done. In a follow-up CL I'll migrate NetworkConfigView to use the new function.

+    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;
+    widget->Init(params);
+  }
   dialog_view->InitDialog();
-  views::Widget* widget = dialog_view->GetWidget();
-  DCHECK(widget);
-  widget->Show();
+  dialog_view->GetWidget()->Show();
 }
 
 bool EnrollmentDialogView::Accept() {
   accepted_ = true;
   return true;
 }
 
 base::string16 EnrollmentDialogView::GetDialogButtonLabel(
     ui::DialogButton button) const {
   if (button == ui::DIALOG_BUTTON_OK)
@@ skipping 174 matching lines @@
 
   DialogEnrollmentDelegate* enrollment =
       new DialogEnrollmentDelegate(owning_window, network->name(), profile);
   return enrollment->Enroll(cert_config.pattern.enrollment_uri_list(),
                             base::Bind(&EnrollmentComplete, service_path));
 }
 
 }  // namespace enrollment
 
 }  // namespace chromeos