Converts exit_warning_handler to use ash common types

ash/accelerators/exit_warning_handler.cc

 // Copyright 2013 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/accelerators/exit_warning_handler.h"

[msw, 2016/07/20 23:35:25]

optional nit: move to ash/common/accelerators?

 
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_window_ids.h"
+#include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
-#include "ash/shell.h"
+#include "ash/common/wm_window.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "grit/ash_strings.h"
 #include "ui/accessibility/ax_view_state.h"
-#include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
@@ skipping 88 matching lines @@
       break;
     case WAIT_FOR_DOUBLE_PRESS:
       state_ = EXITING;
       CancelTimer();
       Hide();
       WmShell::Get()->RecordUserMetricsAction(UMA_ACCEL_EXIT_SECOND_Q);
       WmShell::Get()->delegate()->Exit();
       break;
     case EXITING:
       break;
-    default:
-      NOTREACHED();
-      break;
   }
 }
 
 void ExitWarningHandler::TimerAction() {
   Hide();
   if (state_ == WAIT_FOR_DOUBLE_PRESS)
     state_ = IDLE;
 }
 
 void ExitWarningHandler::StartTimer() {
   if (stub_timer_for_test_)
     return;
   timer_.Start(FROM_HERE,
                base::TimeDelta::FromMilliseconds(kTimeOutMilliseconds), this,
                &ExitWarningHandler::TimerAction);
 }
 
 void ExitWarningHandler::CancelTimer() {
   timer_.Stop();
 }
 
 void ExitWarningHandler::Show() {
   if (widget_)
     return;
-  aura::Window* root_window = Shell::GetTargetRootWindow();
+  WmWindow* root_window = WmShell::Get()->GetRootWindowForNewWindows();
   ExitWarningWidgetDelegateView* delegate = new ExitWarningWidgetDelegateView;
-  gfx::Size rs = root_window->bounds().size();
+  gfx::Size rs = root_window->GetBounds().size();
   gfx::Size ps = delegate->GetPreferredSize();
   gfx::Rect bounds((rs.width() - ps.width()) / 2,
                    (rs.height() - ps.height()) / 3, ps.width(), ps.height());
   views::Widget::InitParams params;
   params.type = views::Widget::InitParams::TYPE_POPUP;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.accept_events = false;
   params.keep_on_top = true;
   params.remove_standard_frame = true;
   params.delegate = delegate;
   params.bounds = bounds;
-  params.parent =
-      Shell::GetContainer(root_window, kShellWindowId_SettingBubbleContainer);
+  params.name = "ExitWarningWindow";
   widget_.reset(new views::Widget);
+  root_window->GetRootWindowController()->ConfigureWidgetInitParamsForContainer(
+      widget_.get(), kShellWindowId_SettingBubbleContainer, &params);
   widget_->Init(params);
   widget_->SetContentsView(delegate);
-  widget_->GetNativeView()->SetName("ExitWarningWindow");
   widget_->Show();
 
   delegate->NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
 }
 
 void ExitWarningHandler::Hide() {
   widget_.reset();
 }
 
 }  // namespace ash