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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 1010443003: Make the lifetime of wallpaper manager more clear. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 709 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 720
721 media::SoundsManager::Shutdown(); 721 media::SoundsManager::Shutdown();
722 722
723 system::StatisticsProvider::GetInstance()->Shutdown(); 723 system::StatisticsProvider::GetInstance()->Shutdown();
724 724
725 // Let the UserManager and WallpaperManager unregister itself as an observer 725 // Let the UserManager and WallpaperManager unregister itself as an observer
726 // of the CrosSettings singleton before it is destroyed. This also ensures 726 // of the CrosSettings singleton before it is destroyed. This also ensures
727 // that the UserManager has no URLRequest pending (see 727 // that the UserManager has no URLRequest pending (see
728 // http://crbug.com/276659). 728 // http://crbug.com/276659).
729 g_browser_process->platform_part()->user_manager()->Shutdown(); 729 g_browser_process->platform_part()->user_manager()->Shutdown();
730 WallpaperManager::Get()->Shutdown(); 730 WallpaperManager::Shutdown();
731 731
732 // Let the DeviceDisablingManager unregister itself as an observer of the 732 // Let the DeviceDisablingManager unregister itself as an observer of the
733 // CrosSettings singleton before it is destroyed. 733 // CrosSettings singleton before it is destroyed.
734 g_browser_process->platform_part()->ShutdownDeviceDisablingManager(); 734 g_browser_process->platform_part()->ShutdownDeviceDisablingManager();
735 735
736 // Let the AutomaticRebootManager unregister itself as an observer of several 736 // Let the AutomaticRebootManager unregister itself as an observer of several
737 // subsystems. 737 // subsystems.
738 g_browser_process->platform_part()->ShutdownAutomaticRebootManager(); 738 g_browser_process->platform_part()->ShutdownAutomaticRebootManager();
739 739
740 // Clean up dependency on CrosSettings and stop pending data fetches. 740 // Clean up dependency on CrosSettings and stop pending data fetches.
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
773 // Destroy DBus services immediately after threads are stopped. 773 // Destroy DBus services immediately after threads are stopped.
774 dbus_services_.reset(); 774 dbus_services_.reset();
775 775
776 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 776 ChromeBrowserMainPartsLinux::PostDestroyThreads();
777 777
778 // Destroy DeviceSettingsService after g_browser_process. 778 // Destroy DeviceSettingsService after g_browser_process.
779 DeviceSettingsService::Shutdown(); 779 DeviceSettingsService::Shutdown();
780 } 780 }
781 781
782 } // namespace chromeos 782 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698