chromeos: Make "mobile network" and "set time" dialogs work with mash

chrome/browser/chromeos/ui/choose_mobile_network_dialog.cc

 // Copyright 2014 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/ui/choose_mobile_network_dialog.h"
 
+#include "ash/public/cpp/shell_window_ids.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/ash/web_dialog_util.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/common/url_constants.h"
 #include "ui/gfx/geometry/size.h"
 
 using content::WebContents;
 using content::WebUIMessageHandler;
 
 namespace {
 
 // Default width/height of the dialog.
 const int kDefaultWidth = 350;
 const int kDefaultHeight = 225;
 
 }  // namespace
 
 namespace chromeos {
 
 // static
 void ChooseMobileNetworkDialog::ShowDialog(gfx::NativeWindow owning_window) {
   chrome::ShowWebDialog(owning_window,
                         ProfileManager::GetActiveUserProfile(),
                         new ChooseMobileNetworkDialog);
 }
 
+// static
+void ChooseMobileNetworkDialog::ShowDialogInContainer(int container_id) {
+  DCHECK_NE(container_id, ash::kShellWindowId_Invalid);

[msw, 2016/10/24 22:18:09]

q: only a couple ids are really expected here, right? Check for those?

[James Cook, 2016/10/25 00:29:04]

Good idea. Done.

+  chrome::ShowWebDialogInContainer(container_id,
+                                   ProfileManager::GetActiveUserProfile(),
+                                   new ChooseMobileNetworkDialog);
+}
+
 ChooseMobileNetworkDialog::ChooseMobileNetworkDialog() {
 }
 
 ui::ModalType ChooseMobileNetworkDialog::GetDialogModalType() const {
   return ui::MODAL_TYPE_SYSTEM;
 }
 
 base::string16 ChooseMobileNetworkDialog::GetDialogTitle() const {
   return base::string16();
 }
@@ skipping 27 matching lines @@
   return false;
 }
 
 bool ChooseMobileNetworkDialog::HandleContextMenu(
     const content::ContextMenuParams& params) {
   // Disable context menu.
   return true;
 }
 
 }  // namespace chromeos