Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(462)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/accelerators/exit_warning_handler.h

Issue 22815016: Merge 217429 "Fix crash on signing out with exit warning bubble ..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1599/src/
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/accelerators/exit_warning_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/exit_warning_handler.h
===================================================================
--- ash/accelerators/exit_warning_handler.h (revision 218536)
+++ ash/accelerators/exit_warning_handler.h (working copy)
@@ -6,6 +6,7 @@
#define ASH_ACCELERATORS_EXIT_WARNING_HANDLER_H_
#include "ash/ash_export.h"
+#include "base/memory/scoped_ptr.h"
#include "base/timer/timer.h"
#include "ui/base/accelerators/accelerator.h"
@@ -71,7 +72,7 @@
void Hide();
State state_;
- views::Widget* widget_; // owned by |this|.
+ scoped_ptr<views::Widget> widget_;
base::OneShotTimer<ExitWarningHandler> timer_;
// Flag to suppress starting the timer for testing. For test we call
« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/accelerators/exit_warning_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698