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

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

Issue 752253002: Updates the mic icon status based on the device's audio state. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 6 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
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 c0327b338e82098547e08bc0cb27b28fed9363f3..c1c09cd5bd80c4a4ce6ce709db80cd16a4d6d2a9 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -753,8 +753,6 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
SystemKeyEventListener::Shutdown();
#endif
- CrasAudioHandler::Shutdown();
-
// Detach D-Bus clients before DBusThreadManager is shut down.
power_button_observer_.reset();
idle_action_warning_observer_.reset();
@@ -804,6 +802,10 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
// Stops all in-flight OAuth2 token fetchers before the IO thread stops.
DeviceOAuth2TokenServiceFactory::Shutdown();
+ // Called after ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() to
+ // wait for removing AudioObservers in chrome/
+ CrasAudioHandler::Shutdown();
+
// Called after
// ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() to be
// executed after execution of chrome::CloseAsh(), because some

Powered by Google App Engine
This is Rietveld 408576698