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

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

Issue 1551133002: Convert Pass()→std::move() in //ash (CrOS edition) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 <utility>
8
7 #include "ash/session/session_state_delegate.h" 9 #include "ash/session/session_state_delegate.h"
8 #include "ash/shell.h" 10 #include "ash/shell.h"
9 #include "ash/system/chromeos/session/logout_confirmation_dialog.h" 11 #include "ash/system/chromeos/session/logout_confirmation_dialog.h"
10 #include "base/location.h" 12 #include "base/location.h"
11 #include "base/time/default_tick_clock.h" 13 #include "base/time/default_tick_clock.h"
12 #include "base/time/tick_clock.h" 14 #include "base/time/tick_clock.h"
13 #include "ui/views/widget/widget.h" 15 #include "ui/views/widget/widget.h"
14 16
15 namespace ash { 17 namespace ash {
16 18
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 dialog_->Update(logout_time_); 51 dialog_->Update(logout_time_);
50 } 52 }
51 53
52 logout_timer_.Start(FROM_HERE, 54 logout_timer_.Start(FROM_HERE,
53 logout_time_ - clock_->NowTicks(), 55 logout_time_ - clock_->NowTicks(),
54 logout_closure_); 56 logout_closure_);
55 } 57 }
56 58
57 void LogoutConfirmationController::SetClockForTesting( 59 void LogoutConfirmationController::SetClockForTesting(
58 scoped_ptr<base::TickClock> clock) { 60 scoped_ptr<base::TickClock> clock) {
59 clock_ = clock.Pass(); 61 clock_ = std::move(clock);
60 } 62 }
61 63
62 void LogoutConfirmationController::OnLockStateChanged(bool locked) { 64 void LogoutConfirmationController::OnLockStateChanged(bool locked) {
63 if (!locked || logout_time_.is_null()) 65 if (!locked || logout_time_.is_null())
64 return; 66 return;
65 67
66 // If the screen is locked while a confirmation dialog is being shown, close 68 // If the screen is locked while a confirmation dialog is being shown, close
67 // the dialog. 69 // the dialog.
68 logout_time_ = base::TimeTicks(); 70 logout_time_ = base::TimeTicks();
69 if (dialog_) 71 if (dialog_)
70 dialog_->GetWidget()->Close(); 72 dialog_->GetWidget()->Close();
71 logout_timer_.Stop(); 73 logout_timer_.Stop();
72 } 74 }
73 75
74 void LogoutConfirmationController::OnLogoutConfirmed() { 76 void LogoutConfirmationController::OnLogoutConfirmed() {
75 logout_timer_.Stop(); 77 logout_timer_.Stop();
76 logout_closure_.Run(); 78 logout_closure_.Run();
77 } 79 }
78 80
79 void LogoutConfirmationController::OnDialogClosed() { 81 void LogoutConfirmationController::OnDialogClosed() {
80 logout_time_ = base::TimeTicks(); 82 logout_time_ = base::TimeTicks();
81 dialog_ = NULL; 83 dialog_ = NULL;
82 logout_timer_.Stop(); 84 logout_timer_.Stop();
83 } 85 }
84 86
85 } // namespace ash 87 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/session/logout_button_tray.cc ('k') | ash/system/chromeos/session/tray_session_length_limit.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698