Merge 217429 "Fix crash on signing out with exit warning bubble ..."

ash/accelerators/exit_warning_handler.cc

Index: ash/accelerators/exit_warning_handler.cc
===================================================================
--- ash/accelerators/exit_warning_handler.cc	(revision 218536)
+++ ash/accelerators/exit_warning_handler.cc	(working copy)
@@ -100,11 +100,10 @@
   DISALLOW_COPY_AND_ASSIGN(ExitWarningWidgetDelegateView);
 };
 
-} // namespace
+}  // namespace
 
 ExitWarningHandler::ExitWarningHandler()
     : state_(IDLE),
-      widget_(NULL),
       stub_timer_for_test_(false) {
 }
 
@@ -169,6 +168,7 @@
   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.can_activate = false;
   params.keep_on_top = true;
@@ -178,7 +178,7 @@
   params.parent = Shell::GetContainer(
       root_window,
       internal::kShellWindowId_SettingBubbleContainer);
-  widget_ = new views::Widget;
+  widget_.reset(new views::Widget);
   widget_->Init(params);
   widget_->SetContentsView(delegate);
   widget_->GetNativeView()->SetName("ExitWarningWindow");
@@ -188,10 +188,7 @@
 }
 
 void ExitWarningHandler::Hide() {
-  if (!widget_)
-    return;
-  widget_->Close();
-  widget_ = NULL;
+  widget_.reset();
 }
 
 }  // namespace ash