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

Side by Side Diff: ash/accelerators/exit_warning_handler.h

Issue 23122003: Fix crash on signing out with exit warning bubble open. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_ACCELERATORS_EXIT_WARNING_HANDLER_H_ 5 #ifndef ASH_ACCELERATORS_EXIT_WARNING_HANDLER_H_
6 #define ASH_ACCELERATORS_EXIT_WARNING_HANDLER_H_ 6 #define ASH_ACCELERATORS_EXIT_WARNING_HANDLER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/memory/scoped_ptr.h"
9 #include "base/timer/timer.h" 10 #include "base/timer/timer.h"
10 #include "ui/base/accelerators/accelerator.h" 11 #include "ui/base/accelerators/accelerator.h"
11 12
12 namespace views { 13 namespace views {
13 class Widget; 14 class Widget;
14 } 15 }
15 16
16 namespace ash { 17 namespace ash {
17 18
18 // In order to avoid accidental exits when the user presses the exit 19 // In order to avoid accidental exits when the user presses the exit
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 // Performs actions when the time limit is exceeded. 65 // Performs actions when the time limit is exceeded.
65 void TimerAction(); 66 void TimerAction();
66 67
67 void StartTimer(); 68 void StartTimer();
68 void CancelTimer(); 69 void CancelTimer();
69 70
70 void Show(); 71 void Show();
71 void Hide(); 72 void Hide();
72 73
73 State state_; 74 State state_;
74 views::Widget* widget_; // owned by |this|. 75 scoped_ptr<views::Widget> widget_;
75 base::OneShotTimer<ExitWarningHandler> timer_; 76 base::OneShotTimer<ExitWarningHandler> timer_;
76 77
77 // Flag to suppress starting the timer for testing. For test we call 78 // Flag to suppress starting the timer for testing. For test we call
78 // TimerAction() directly to simulate the expiration of the timer. 79 // TimerAction() directly to simulate the expiration of the timer.
79 bool stub_timer_for_test_; 80 bool stub_timer_for_test_;
80 81
81 DISALLOW_COPY_AND_ASSIGN(ExitWarningHandler); 82 DISALLOW_COPY_AND_ASSIGN(ExitWarningHandler);
82 }; 83 };
83 84
84 } // namespace ash 85 } // namespace ash
85 86
86 #endif // ASH_ACCELERATORS_EXIT_WARNING_HANDLER_H_ 87 #endif // ASH_ACCELERATORS_EXIT_WARNING_HANDLER_H_
OLDNEW
« 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