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

Issues Search
    My Issues | Starred     Open | Closed | All

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: Initial upload 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/palette_delegate.h ('k') | ash/common/system/chromeos/palette/palette_tray.h » ('j') | ash/common/system/chromeos/palette/palette_tray.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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') | ash/common/system/chromeos/palette/palette_tray.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698