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

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

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 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_state_delegate.h" 7 #include "ash/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"
11 #include "base/time/default_tick_clock.h" 11 #include "base/time/default_tick_clock.h"
12 #include "base/time/tick_clock.h" 12 #include "base/time/tick_clock.h"
13 #include "ui/views/widget/widget.h" 13 #include "ui/views/widget/widget.h"
14 14
15 namespace ash { 15 namespace ash {
16 namespace internal {
17 16
18 LogoutConfirmationController::LogoutConfirmationController( 17 LogoutConfirmationController::LogoutConfirmationController(
19 const base::Closure& logout_closure) 18 const base::Closure& logout_closure)
20 : clock_(new base::DefaultTickClock), 19 : clock_(new base::DefaultTickClock),
21 logout_closure_(logout_closure), 20 logout_closure_(logout_closure),
22 dialog_(NULL), 21 dialog_(NULL),
23 logout_timer_(false, false) { 22 logout_timer_(false, false) {
24 if (Shell::HasInstance()) 23 if (Shell::HasInstance())
25 Shell::GetInstance()->AddShellObserver(this); 24 Shell::GetInstance()->AddShellObserver(this);
26 } 25 }
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 logout_timer_.Stop(); 75 logout_timer_.Stop();
77 logout_closure_.Run(); 76 logout_closure_.Run();
78 } 77 }
79 78
80 void LogoutConfirmationController::OnDialogClosed() { 79 void LogoutConfirmationController::OnDialogClosed() {
81 logout_time_ = base::TimeTicks(); 80 logout_time_ = base::TimeTicks();
82 dialog_ = NULL; 81 dialog_ = NULL;
83 logout_timer_.Stop(); 82 logout_timer_.Stop();
84 } 83 }
85 84
86 } // namespace internal
87 } // namespace ash 85 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698