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

chrome/browser/chromeos/set_time_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/set_time_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 "content/public/browser/user_metrics.h"
 #include "ui/gfx/geometry/size.h"
 
 using content::WebContents;
 using content::WebUIMessageHandler;
 
 namespace chromeos {
 
 namespace {
 
 const int kDefaultWidth = 490;
 const int kDefaultHeight = 235;
 
 }  // namespace
 
 // 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() {
 }
 
 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;
 }
 
 base::string16 SetTimeDialog::GetDialogTitle() const {
   return base::string16();
 }
 
 GURL SetTimeDialog::GetDialogContentURL() const {
   return GURL(chrome::kChromeUISetTimeURL);
@@ skipping 24 matching lines @@
   return false;
 }
 
 bool SetTimeDialog::HandleContextMenu(
     const content::ContextMenuParams& params) {
   // Disable context menu.
   return true;
 }
 
 }  // namespace chromeos