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

Unified Diff: ash/system/chromeos/session/logout_confirmation_controller.cc

Issue 2108793002: mash: Convert system tray logout button to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more review comments, fix mash_unittests 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 side-by-side diff with in-line comments
Download patch
Index: ash/system/chromeos/session/logout_confirmation_controller.cc
diff --git a/ash/system/chromeos/session/logout_confirmation_controller.cc b/ash/system/chromeos/session/logout_confirmation_controller.cc
deleted file mode 100644
index fba683a54b6c236546dbd1aa6cbfd776b2e49f0c..0000000000000000000000000000000000000000
--- a/ash/system/chromeos/session/logout_confirmation_controller.cc
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ash/system/chromeos/session/logout_confirmation_controller.h"
-
-#include <utility>
-
-#include "ash/common/wm_shell.h"
-#include "ash/system/chromeos/session/logout_confirmation_dialog.h"
-#include "base/location.h"
-#include "base/time/default_tick_clock.h"
-#include "base/time/tick_clock.h"
-#include "ui/views/widget/widget.h"
-
-namespace ash {
-
-LogoutConfirmationController::LogoutConfirmationController(
- const base::Closure& logout_closure)
- : clock_(new base::DefaultTickClock),
- logout_closure_(logout_closure),
- dialog_(NULL),
- logout_timer_(false, false) {
- if (WmShell::HasInstance())
- WmShell::Get()->AddShellObserver(this);
-}
-
-LogoutConfirmationController::~LogoutConfirmationController() {
- if (WmShell::HasInstance())
- WmShell::Get()->RemoveShellObserver(this);
- if (dialog_)
- dialog_->ControllerGone();
-}
-
-void LogoutConfirmationController::ConfirmLogout(base::TimeTicks logout_time) {
- if (!logout_time_.is_null() && logout_time >= logout_time_) {
- // If a confirmation dialog is already being shown and its countdown expires
- // no later than the |logout_time| requested now, keep the current dialog
- // open.
- return;
- }
- logout_time_ = logout_time;
-
- if (!dialog_) {
- // Show confirmation dialog unless this is a unit test without a Shell.
- if (WmShell::HasInstance())
- dialog_ = new LogoutConfirmationDialog(this, logout_time_);
- } else {
- dialog_->Update(logout_time_);
- }
-
- logout_timer_.Start(FROM_HERE, logout_time_ - clock_->NowTicks(),
- logout_closure_);
-}
-
-void LogoutConfirmationController::SetClockForTesting(
- std::unique_ptr<base::TickClock> clock) {
- clock_ = std::move(clock);
-}
-
-void LogoutConfirmationController::OnLockStateChanged(bool locked) {
- if (!locked || logout_time_.is_null())
- return;
-
- // If the screen is locked while a confirmation dialog is being shown, close
- // the dialog.
- logout_time_ = base::TimeTicks();
- if (dialog_)
- dialog_->GetWidget()->Close();
- logout_timer_.Stop();
-}
-
-void LogoutConfirmationController::OnLogoutConfirmed() {
- logout_timer_.Stop();
- logout_closure_.Run();
-}
-
-void LogoutConfirmationController::OnDialogClosed() {
- logout_time_ = base::TimeTicks();
- dialog_ = NULL;
- logout_timer_.Stop();
-}
-
-} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698