| Index: ash/accelerators/exit_warning_handler.cc
|
| diff --git a/ash/accelerators/exit_warning_handler.cc b/ash/accelerators/exit_warning_handler.cc
|
| index 84f46b05ba424ad3e50505cff90d858c3fc7ccf9..7b8f3c5ac2a2cd4abffff98876e3ba5e3038df9f 100644
|
| --- a/ash/accelerators/exit_warning_handler.cc
|
| +++ b/ash/accelerators/exit_warning_handler.cc
|
| @@ -144,9 +144,9 @@ void ExitWarningHandler::CancelTimer() {
|
| void ExitWarningHandler::Show() {
|
| if (widget_)
|
| return;
|
| - WmWindow* root_window = Shell::GetWmRootWindowForNewWindows();
|
| + aura::Window* root_window = Shell::GetRootWindowForNewWindows();
|
| ExitWarningWidgetDelegateView* delegate = new ExitWarningWidgetDelegateView;
|
| - gfx::Size rs = root_window->GetBounds().size();
|
| + gfx::Size rs = root_window->bounds().size();
|
| gfx::Size ps = delegate->GetPreferredSize();
|
| gfx::Rect bounds((rs.width() - ps.width()) / 2,
|
| (rs.height() - ps.height()) / 3, ps.width(), ps.height());
|
| @@ -161,8 +161,9 @@ void ExitWarningHandler::Show() {
|
| params.bounds = bounds;
|
| params.name = "ExitWarningWindow";
|
| widget_.reset(new views::Widget);
|
| - root_window->GetRootWindowController()->ConfigureWidgetInitParamsForContainer(
|
| - widget_.get(), kShellWindowId_SettingBubbleContainer, ¶ms);
|
| + GetRootWindowController(root_window)
|
| + ->ConfigureWidgetInitParamsForContainer(
|
| + widget_.get(), kShellWindowId_SettingBubbleContainer, ¶ms);
|
| widget_->Init(params);
|
| widget_->Show();
|
|
|
|
|