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

chrome/browser/chromeos/set_time_dialog.cc

Index: chrome/browser/chromeos/set_time_dialog.cc
diff --git a/chrome/browser/chromeos/set_time_dialog.cc b/chrome/browser/chromeos/set_time_dialog.cc
index ce3462d9cc52d6f9ded7fed6c7aa407a9f00d632..5c4530c550475695888014af9c3ac5222b65f352 100644
--- a/chrome/browser/chromeos/set_time_dialog.cc
+++ b/chrome/browser/chromeos/set_time_dialog.cc
@@ -6,7 +6,7 @@
 
 #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 "content/public/browser/user_metrics.h"
 #include "ui/gfx/geometry/size.h"
@@ -26,13 +26,18 @@ const int kDefaultHeight = 235;
 // static
 void SetTimeDialog::ShowDialogInParent(gfx::NativeWindow parent) {
   DCHECK(parent);
-  ShowDialogImpl(parent, ash::kShellWindowId_Invalid);
+  content::RecordAction(base::UserMetricsAction("Options_SetTimeDialog_Show"));
+  chrome::ShowWebDialog(parent, ProfileManager::GetActiveUserProfile(),
+                        new SetTimeDialog());
 }
 
 // static
 void SetTimeDialog::ShowDialogInContainer(int container_id) {
   DCHECK_NE(container_id, ash::kShellWindowId_Invalid);
-  ShowDialogImpl(nullptr, container_id);
+  content::RecordAction(base::UserMetricsAction("Options_SetTimeDialog_Show"));
+  chrome::ShowWebDialogInContainer(container_id,
+                                   ProfileManager::GetActiveUserProfile(),
+                                   new SetTimeDialog());
 }
 
 SetTimeDialog::SetTimeDialog() {
@@ -41,15 +46,6 @@ SetTimeDialog::SetTimeDialog() {
 SetTimeDialog::~SetTimeDialog() {
 }
 
-// static
-void SetTimeDialog::ShowDialogImpl(gfx::NativeWindow parent, int container_id) {
-  DCHECK(parent || container_id != ash::kShellWindowId_Invalid);
-  content::RecordAction(base::UserMetricsAction("Options_SetTimeDialog_Show"));
-  chrome::ShowWebDialogWithContainer(parent, container_id,
-                                     ProfileManager::GetActiveUserProfile(),
-                                     new SetTimeDialog());
-}
-
 ui::ModalType SetTimeDialog::GetDialogModalType() const {
   return ui::MODAL_TYPE_SYSTEM;
 }