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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 1877153003: mash: Fix crashes during chrome teardown. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « no previous file | content/browser/browser_main_loop.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 319a0c9017b6509c3070f32b37e08015bf6cd7b6..9921c466d4b7833dbf51274110b6c409dffb22e7 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -812,7 +812,8 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
power_button_observer_.reset();
idle_action_warning_observer_.reset();
- MagnificationManager::Shutdown();
+ if (!IsRunningAsMusClient())
+ MagnificationManager::Shutdown();
media::SoundsManager::Shutdown();
@@ -849,7 +850,8 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
// Ash needs to be closed before UserManager is destroyed.
ChromeBrowserMainPartsLinux::PostMainMessageLoopRun();
- AccessibilityManager::Shutdown();
+ if (!IsRunningAsMusClient())
+ AccessibilityManager::Shutdown();
input_method::Shutdown();
« no previous file with comments | « no previous file | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698