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

Unified Diff: ash/common/shelf/shelf_window_watcher.cc

Issue 2247503002: mash: Create and show a shelf in mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. 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
Index: ash/common/shelf/shelf_window_watcher.cc
diff --git a/ash/common/shelf/shelf_window_watcher.cc b/ash/common/shelf/shelf_window_watcher.cc
index 3288f955e6277d48658f5efad10fb9ee8e0c35a4..5470399e49d0b3f84a6754d5ffe2110379f59ac4 100644
--- a/ash/common/shelf/shelf_window_watcher.cc
+++ b/ash/common/shelf/shelf_window_watcher.cc
@@ -102,7 +102,8 @@ ShelfWindowWatcher::ShelfWindowWatcher(ShelfModel* model)
ShelfWindowWatcher::~ShelfWindowWatcher() {
display::Screen::GetScreen()->RemoveObserver(this);
- WmShell::Get()->RemoveActivationObserver(this);
+ if (WmShell::HasInstance())
James Cook 2016/08/17 03:29:39 Why is this needed? ShelfWindowWatcher is owned by
msw 2016/08/17 17:45:44 Fixed instead by calling WmShell::Shutdown in Wind
+ WmShell::Get()->RemoveActivationObserver(this);
}
void ShelfWindowWatcher::AddShelfItem(WmWindow* window) {

Powered by Google App Engine
This is Rietveld 408576698