| 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 62ceebba9b5873b7c7fc029741710c7adf243f61..de180fca593b3a165d3c82bfa2aa3be74ea8ecd7 100644
|
| --- a/chrome/browser/chromeos/set_time_dialog.cc
|
| +++ b/chrome/browser/chromeos/set_time_dialog.cc
|
| @@ -4,8 +4,9 @@
|
|
|
| #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/browser_dialogs.h"
|
| +#include "chrome/browser/ui/ash/web_dialog_util.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "content/public/browser/user_metrics.h"
|
| #include "ui/gfx/geometry/size.h"
|
| @@ -20,14 +21,26 @@ namespace {
|
| const int kDefaultWidth = 490;
|
| const int kDefaultHeight = 235;
|
|
|
| +void ShowDialog(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());
|
| +}
|
| +
|
| } // namespace
|
|
|
| // static
|
| -void SetTimeDialog::ShowDialog(gfx::NativeWindow owning_window) {
|
| - content::RecordAction(base::UserMetricsAction("Options_SetTimeDialog_Show"));
|
| - chrome::ShowWebDialog(owning_window,
|
| - ProfileManager::GetActiveUserProfile(),
|
| - new SetTimeDialog());
|
| +void SetTimeDialog::ShowDialogInParent(gfx::NativeWindow parent) {
|
| + DCHECK(parent);
|
| + ShowDialog(parent, ash::kShellWindowId_Invalid);
|
| +}
|
| +
|
| +// static
|
| +void SetTimeDialog::ShowDialogInContainer(int container_id) {
|
| + DCHECK(container_id != ash::kShellWindowId_Invalid);
|
| + ShowDialog(nullptr, container_id);
|
| }
|
|
|
| SetTimeDialog::SetTimeDialog() {
|
|
|