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

Unified Diff: content/shell/browser/shell_views.cc

Issue 2459413002: Fixes possible crash in content shell shutdown (Closed)
Patch Set: Created 4 years, 1 month 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/shell_views.cc
diff --git a/content/shell/browser/shell_views.cc b/content/shell/browser/shell_views.cc
index c3c95d4bae5c95dfc077297e26b9bde457f8384b..80fe577f41688fa0e1a40e5dcf479d41b0db71c9 100644
--- a/content/shell/browser/shell_views.cc
+++ b/content/shell/browser/shell_views.cc
@@ -349,14 +349,15 @@ void Shell::PlatformExit() {
delete test_screen_;
test_screen_ = nullptr;
-#elif defined(USE_AURA)
- delete wm_state_;
- wm_state_ = nullptr;
#endif
delete views_delegate_;
views_delegate_ = nullptr;
delete platform_;
platform_ = nullptr;
+#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+ delete wm_state_;
+ wm_state_ = nullptr;
+#endif
}
void Shell::PlatformCleanUp() {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698