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

chrome/browser/chromeos/options/network_config_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/options/network_config_view.h"
 
 #include <algorithm>
 
+#include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/options/network_property_ui_data.h"
 #include "chrome/browser/chromeos/options/vpn_config_view.h"
 #include "chrome/browser/chromeos/options/wifi_config_view.h"
 #include "chrome/browser/chromeos/options/wimax_config_view.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "components/device_event_log/device_event_log.h"
 #include "components/user_manager/user.h"
+#include "services/ui/public/cpp/property_type_converters.h"
+#include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/image_view.h"
@@ skipping 74 matching lines @@
   }
   return child_config_view_ != nullptr;
 }
 
 NetworkConfigView::~NetworkConfigView() {
   DCHECK(GetActiveDialog() == this);
   SetActiveDialog(nullptr);
 }
 
 // static
-void NetworkConfigView::Show(const std::string& service_path,
-                             gfx::NativeWindow parent) {
+void NetworkConfigView::ShowByServicePath(const std::string& service_path,
+                                          gfx::NativeWindow parent) {
+  DCHECK(parent);
   const NetworkState* network = NetworkHandler::Get()->network_state_handler()->
       GetNetworkState(service_path);
-  ShowByNetwork(network, parent);
+  ShowByNetwork(network, parent, ash::kShellWindowId_Invalid);
 }
 
 // static
 void NetworkConfigView::ShowByNetworkId(const std::string& network_id,
-                                        gfx::NativeWindow parent) {
+                                        int container_id) {
+  DCHECK_NE(container_id, ash::kShellWindowId_Invalid);
   const NetworkState* network =
       NetworkHandler::Get()->network_state_handler()->GetNetworkStateFromGuid(
           network_id);
-  ShowByNetwork(network, parent);
+  ShowByNetwork(network, nullptr, container_id);
 }
 
 // static
 void NetworkConfigView::ShowByNetwork(const NetworkState* network,
-                                      gfx::NativeWindow parent) {
+                                      gfx::NativeWindow parent,
+                                      int container_id) {
+  DCHECK(parent || container_id != ash::kShellWindowId_Invalid);
   if (GetActiveDialog() != nullptr)
     return;
   if (!network) {
     LOG(ERROR) << "NetworkConfigView::Show called with invalid network";
     return;
   }
   NetworkConfigView* view = new NetworkConfigView();
   if (!view->InitWithNetworkState(network)) {
     LOG(ERROR) << "NetworkConfigView::Show called with invalid network type: "
                << network->type();
     delete view;
     return;
   }
   NET_LOG(USER) << "NetworkConfigView::Show: " << network->path();
-  view->ShowDialog(parent);
+  if (parent)
+    view->ShowDialog(parent);
+  else
+    view->ShowDialogInContainer(container_id);
 }
 
 // static
 void NetworkConfigView::ShowForType(const std::string& type,
                                     gfx::NativeWindow parent) {
   if (GetActiveDialog() != nullptr)
     return;
   NetworkConfigView* view = new NetworkConfigView();
   if (!view->InitWithType(type)) {
     LOG(ERROR) << "NetworkConfigView::ShowForType called with invalid type: "
@@ skipping 129 matching lines @@
   // Failed connections may result in a pop-up with no natural parent window,
   // so provide a fallback context on the primary display. This is necessary
   // becase one of parent or context must be non nullptr.
   gfx::NativeWindow context =
       parent ? nullptr : ash::Shell::GetPrimaryRootWindow();
   Widget* window = DialogDelegate::CreateDialogWidget(this, context, parent);
   window->SetAlwaysOnTop(true);
   window->Show();
 }
 
+void NetworkConfigView::ShowDialogInContainer(int container_id) {
+  DCHECK_NE(container_id, ash::kShellWindowId_Invalid);
+  Widget::InitParams params = DialogDelegate::GetDialogWidgetInitParams(
+      this, nullptr, nullptr, gfx::Rect());
+  Widget* window = new Widget;
+  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);
+  }
+  window->Init(params);
+  window->SetAlwaysOnTop(true);
+  window->Show();
+}
+
 // ChildNetworkConfigView
 
 ChildNetworkConfigView::ChildNetworkConfigView(
     NetworkConfigView* parent,
     const std::string& service_path)
     : parent_(parent),
       service_path_(service_path) {
 }
 
 ChildNetworkConfigView::~ChildNetworkConfigView() {
@@ skipping 28 matching lines @@
 }
 
 ControlledSettingIndicatorView::~ControlledSettingIndicatorView() {}
 
 gfx::Size ControlledSettingIndicatorView::GetPreferredSize() const {
   return (managed_ && visible()) ? image_view_->GetPreferredSize()
                                  : gfx::Size();
 }
 
 }  // namespace chromeos