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

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

Issue 774553002: Revert of 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: Created 6 years 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 | chrome/browser/ui/app_list/search/search_resource_manager.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 58ae1d8752ddfab93a9809c4c96ef4bedcbd1a82..448c8c8d039573d1a70fcef3728002092d1dcf11 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -753,6 +753,8 @@
SystemKeyEventListener::Shutdown();
#endif
+ CrasAudioHandler::Shutdown();
+
// Detach D-Bus clients before DBusThreadManager is shut down.
power_button_observer_.reset();
idle_action_warning_observer_.reset();
@@ -802,9 +804,6 @@
// Stops all in-flight OAuth2 token fetchers before the IO thread stops.
DeviceOAuth2TokenServiceFactory::Shutdown();
- // Shutdown after PostMainMessageLoopRun() which should destroy all observers.
- CrasAudioHandler::Shutdown();
-
// Called after
// ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() to be
// executed after execution of chrome::CloseAsh(), because some
« no previous file with comments | « no previous file | chrome/browser/ui/app_list/search/search_resource_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698