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

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

Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveshelfmodel
Patch Set: Created 4 years, 6 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> 7 #include <utility>
8 8
9 #include "ash/session/session_state_delegate.h" 9 #include "ash/common/session/session_state_delegate.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ash/system/chromeos/session/logout_confirmation_dialog.h" 11 #include "ash/system/chromeos/session/logout_confirmation_dialog.h"
12 #include "base/location.h" 12 #include "base/location.h"
13 #include "base/time/default_tick_clock.h" 13 #include "base/time/default_tick_clock.h"
14 #include "base/time/tick_clock.h" 14 #include "base/time/tick_clock.h"
15 #include "ui/views/widget/widget.h" 15 #include "ui/views/widget/widget.h"
16 16
17 namespace ash { 17 namespace ash {
18 18
19 LogoutConfirmationController::LogoutConfirmationController( 19 LogoutConfirmationController::LogoutConfirmationController(
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 logout_closure_.Run(); 78 logout_closure_.Run();
79 } 79 }
80 80
81 void LogoutConfirmationController::OnDialogClosed() { 81 void LogoutConfirmationController::OnDialogClosed() {
82 logout_time_ = base::TimeTicks(); 82 logout_time_ = base::TimeTicks();
83 dialog_ = NULL; 83 dialog_ = NULL;
84 logout_timer_.Stop(); 84 logout_timer_.Stop();
85 } 85 }
86 86
87 } // namespace ash 87 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698