ash/common/system/chromeos/session/logout_confirmation_controller.cc - Issue 2739763003: Moves maintaining ShellObservers back to Shell

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2739763003: Moves maintaining ShellObservers back to Shell (Closed)

Patch Set: merge Created 3 years, 9 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

« no previous file with comments | « ash/common/system/chromeos/screen_security/screen_capture_tray_item.cc ('k') | ash/common/system/overview/overview_button_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/common/system/chromeos/session/logout_confirmation_controller.cc

diff --git a/ash/common/system/chromeos/session/logout_confirmation_controller.cc b/ash/common/system/chromeos/session/logout_confirmation_controller.cc

index 80726792bb7b4cec31103ed29c003607d19f12c2..622c9122fd4cbf69deb2428222743d283f33d4bd 100644

--- a/ash/common/system/chromeos/session/logout_confirmation_controller.cc

+++ b/ash/common/system/chromeos/session/logout_confirmation_controller.cc

@@ -11,6 +11,7 @@

#include "ash/common/system/tray/system_tray_delegate.h"

#include "ash/common/system/tray/system_tray_notifier.h"

#include "ash/common/wm_shell.h"

+#include "ash/shell.h"

#include "base/location.h"

#include "base/time/default_tick_clock.h"

#include "base/time/tick_clock.h"

@@ -28,14 +29,14 @@ LogoutConfirmationController::LogoutConfirmationController(

dialog_(NULL),

logout_timer_(false, false) {

if (WmShell::HasInstance()) {

- WmShell::Get()->AddShellObserver(this);

+ Shell::GetInstance()->AddShellObserver(this);

WmShell::Get()->system_tray_notifier()->AddLastWindowClosedObserver(this);

}

LogoutConfirmationController::~LogoutConfirmationController() {

if (WmShell::HasInstance()) {

- WmShell::Get()->RemoveShellObserver(this);

+ Shell::GetInstance()->RemoveShellObserver(this);

WmShell::Get()->system_tray_notifier()->RemoveLastWindowClosedObserver(

this);

}