ash/common/session/session_state_observer.cc - Issue 2258553004: Add pref to enable/disable palette tray.

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/session/session_state_observer.cc

Issue 2258553004: Add pref to enable/disable palette tray. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr

Patch Set: Rebase Created 4 years, 4 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:

Index: ash/common/session/session_state_observer.cc

diff --git a/ash/common/session/session_state_observer.cc b/ash/common/session/session_state_observer.cc

index a05607ee0823cc000ad9aeebb3d05b76dcfd4b3d..27bbe9d8d3c79448989f1fa8c92d9de93112de35 100644

--- a/ash/common/session/session_state_observer.cc

+++ b/ash/common/session/session_state_observer.cc

@@ -16,8 +16,10 @@ ScopedSessionStateObserver::ScopedSessionStateObserver(

}

ScopedSessionStateObserver::~ScopedSessionStateObserver() {

- WmShell::Get()->GetSessionStateDelegate()->RemoveSessionStateObserver(

- observer_);

+ if (WmShell::Get()) {

+ WmShell::Get()->GetSessionStateDelegate()->RemoveSessionStateObserver(

+ observer_);

+ }

}

} // namespace ash

« no previous file with comments | « ash/common/palette_delegate.h ('k') | ash/common/system/chromeos/palette/palette_tray.h » ('j') | no next file with comments »