mash: Convert system tray logout button to wm common types

ash/common/system/chromeos/session/logout_confirmation_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 "ash/system/chromeos/session/logout_confirmation_dialog.h"
+#include "ash/common/system/chromeos/session/logout_confirmation_dialog.h"
 
+#include "ash/common/shell_window_ids.h"
+#include "ash/common/system/chromeos/session/logout_confirmation_controller.h"
 #include "ash/common/system/tray/tray_constants.h"
-#include "ash/shell.h"
-#include "ash/system/chromeos/session/logout_confirmation_controller.h"
+#include "ash/common/wm_root_window_controller.h"
+#include "ash/common/wm_shell.h"
 #include "base/location.h"
 #include "base/time/tick_clock.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/time_format.h"
 #include "ui/base/ui_base_types.h"
+#include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace {
 
 const int kCountdownUpdateIntervalMs = 1000;  // 1 second.
@@ skipping 10 matching lines @@
 
   label_ = new views::Label;
   label_->SetBorder(views::Border::CreateEmptyBorder(
       0, kTrayPopupPaddingHorizontal, 0, kTrayPopupPaddingHorizontal));
   label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   label_->SetMultiLine(true);
   AddChildView(label_);
 
   UpdateLabel();
 
-  CreateDialogWidget(this, ash::Shell::GetPrimaryRootWindow(), NULL);
-  GetWidget()->Show();
+  views::Widget* widget = new views::Widget;
+  views::Widget::InitParams params =
+      GetDialogWidgetInitParams(this, nullptr, nullptr, gfx::Rect());
+  WmShell::Get()

[msw, 2016/06/28 19:31:03]

aside: I wish this were easier, but I don't see a better pattern offhand.

[James Cook, 2016/06/28 20:14:46]

Acknowledged.

+      ->GetPrimaryRootWindowController()
+      ->ConfigureWidgetInitParamsForContainer(
+          widget, kShellWindowId_SystemModalContainer, &params);
+  widget->Init(params);
+  widget->Show();
 
   update_timer_.Start(
       FROM_HERE, base::TimeDelta::FromMilliseconds(kCountdownUpdateIntervalMs),
       this, &LogoutConfirmationDialog::UpdateLabel);
 }
 
 LogoutConfirmationDialog::~LogoutConfirmationDialog() {}
 
 void LogoutConfirmationDialog::Update(base::TimeTicks logout_time) {
   logout_time_ = logout_time;
@@ skipping 43 matching lines @@
                                  ui::TimeFormat::LENGTH_LONG, 10,
                                  time_remaining)));
   } else {
     label_->SetText(
         l10n_util::GetStringUTF16(IDS_ASH_LOGOUT_CONFIRMATION_WARNING_NOW));
     update_timer_.Stop();
   }
 }
 
 }  // namespace ash