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

Side by Side Diff: ash/system/chromeos/session/logout_confirmation_controller.cc

Issue 670623002: Change base::TickClock to a ref counted class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@audio_redesign
Patch Set: y Created 6 years, 2 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "ash/system/chromeos/session/logout_confirmation_controller.h" 5 #include "ash/system/chromeos/session/logout_confirmation_controller.h"
6 6
7 #include "ash/session/session_state_delegate.h" 7 #include "ash/session/session_state_delegate.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/system/chromeos/session/logout_confirmation_dialog.h" 9 #include "ash/system/chromeos/session/logout_confirmation_dialog.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 } else { 48 } else {
49 dialog_->Update(logout_time_); 49 dialog_->Update(logout_time_);
50 } 50 }
51 51
52 logout_timer_.Start(FROM_HERE, 52 logout_timer_.Start(FROM_HERE,
53 logout_time_ - clock_->NowTicks(), 53 logout_time_ - clock_->NowTicks(),
54 logout_closure_); 54 logout_closure_);
55 } 55 }
56 56
57 void LogoutConfirmationController::SetClockForTesting( 57 void LogoutConfirmationController::SetClockForTesting(
58 scoped_ptr<base::TickClock> clock) { 58 const scoped_refptr<base::TickClock>& clock) {
59 clock_ = clock.Pass(); 59 clock_ = clock;
60 } 60 }
61 61
62 void LogoutConfirmationController::OnLockStateChanged(bool locked) { 62 void LogoutConfirmationController::OnLockStateChanged(bool locked) {
63 if (!locked || logout_time_.is_null()) 63 if (!locked || logout_time_.is_null())
64 return; 64 return;
65 65
66 // If the screen is locked while a confirmation dialog is being shown, close 66 // If the screen is locked while a confirmation dialog is being shown, close
67 // the dialog. 67 // the dialog.
68 logout_time_ = base::TimeTicks(); 68 logout_time_ = base::TimeTicks();
69 if (dialog_) 69 if (dialog_)
70 dialog_->GetWidget()->Close(); 70 dialog_->GetWidget()->Close();
71 logout_timer_.Stop(); 71 logout_timer_.Stop();
72 } 72 }
73 73
74 void LogoutConfirmationController::OnLogoutConfirmed() { 74 void LogoutConfirmationController::OnLogoutConfirmed() {
75 logout_timer_.Stop(); 75 logout_timer_.Stop();
76 logout_closure_.Run(); 76 logout_closure_.Run();
77 } 77 }
78 78
79 void LogoutConfirmationController::OnDialogClosed() { 79 void LogoutConfirmationController::OnDialogClosed() {
80 logout_time_ = base::TimeTicks(); 80 logout_time_ = base::TimeTicks();
81 dialog_ = NULL; 81 dialog_ = NULL;
82 logout_timer_.Stop(); 82 logout_timer_.Stop();
83 } 83 }
84 84
85 } // namespace ash 85 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698