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

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"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 82 matching lines @@
   base::string16 text_;
   base::string16 accessible_name_;
   gfx::Font font_;
   int text_width_;
   int width_;
   int height_;
 
   DISALLOW_COPY_AND_ASSIGN(ExitWarningWidgetDelegateView);
 };
 
-} // namespace
+}  // namespace
 
 ExitWarningHandler::ExitWarningHandler()
     : state_(IDLE),
-      widget_(NULL),
       stub_timer_for_test_(false) {
 }
 
 ExitWarningHandler::~ExitWarningHandler() {
   // Note: If a timer is outstanding, it is stopped in its destructor.
   Hide();
 }
 
 void ExitWarningHandler::HandleAccelerator() {
   ShellDelegate* shell_delegate = Shell::GetInstance()->delegate();
@@ skipping 44 matching lines @@
   aura::RootWindow* root_window = Shell::GetActiveRootWindow();
   ExitWarningWidgetDelegateView* delegate = new ExitWarningWidgetDelegateView;
   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());
   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;
   params.remove_standard_frame = true;
   params.delegate = delegate;
   params.bounds = bounds;
   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");
   widget_->Show();
 
   delegate->NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_ALERT, true);
 }
 
 void ExitWarningHandler::Hide() {
-  if (!widget_)
-    return;
-  widget_->Close();
-  widget_ = NULL;
+  widget_.reset();
 }
 
 }  // namespace ash