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

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: Fix the failed unittests. 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 AccessibilityManager::Initialize(); 416 AccessibilityManager::Initialize();
417 MagnificationManager::Initialize(); 417 MagnificationManager::Initialize();
418 418
419 wallpaper::WallpaperManagerBase::SetPathIds( 419 wallpaper::WallpaperManagerBase::SetPathIds(
420 chrome::DIR_USER_DATA, 420 chrome::DIR_USER_DATA,
421 chrome::DIR_CHROMEOS_WALLPAPERS, 421 chrome::DIR_CHROMEOS_WALLPAPERS,
422 chrome::DIR_CHROMEOS_CUSTOM_WALLPAPERS); 422 chrome::DIR_CHROMEOS_CUSTOM_WALLPAPERS);
423 423
424 // Add observers for WallpaperManager. This depends on PowerManagerClient, 424 // Add observers for WallpaperManager. This depends on PowerManagerClient,
425 // TimezoneSettings and CrosSettings. 425 // TimezoneSettings and CrosSettings.
426 WallpaperManager::Initialize();
426 WallpaperManager::Get()->AddObservers(); 427 WallpaperManager::Get()->AddObservers();
427 428
428 base::PostTaskAndReplyWithResult( 429 base::PostTaskAndReplyWithResult(
429 content::BrowserThread::GetBlockingPool(), 430 content::BrowserThread::GetBlockingPool(),
430 FROM_HERE, 431 FROM_HERE,
431 base::Bind(&version_loader::GetVersion, 432 base::Bind(&version_loader::GetVersion,
432 version_loader::VERSION_FULL), 433 version_loader::VERSION_FULL),
433 base::Bind(&ChromeOSVersionCallback)); 434 base::Bind(&ChromeOSVersionCallback));
434 435
435 // Make sure that wallpaper boot transition and other delays in OOBE 436 // Make sure that wallpaper boot transition and other delays in OOBE
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 721
721 media::SoundsManager::Shutdown(); 722 media::SoundsManager::Shutdown();
722 723
723 system::StatisticsProvider::GetInstance()->Shutdown(); 724 system::StatisticsProvider::GetInstance()->Shutdown();
724 725
725 // Let the UserManager and WallpaperManager unregister itself as an observer 726 // Let the UserManager and WallpaperManager unregister itself as an observer
726 // of the CrosSettings singleton before it is destroyed. This also ensures 727 // of the CrosSettings singleton before it is destroyed. This also ensures
727 // that the UserManager has no URLRequest pending (see 728 // that the UserManager has no URLRequest pending (see
728 // http://crbug.com/276659). 729 // http://crbug.com/276659).
729 g_browser_process->platform_part()->user_manager()->Shutdown(); 730 g_browser_process->platform_part()->user_manager()->Shutdown();
730 WallpaperManager::Get()->Shutdown(); 731 WallpaperManager::Shutdown();
731 732
732 // Let the DeviceDisablingManager unregister itself as an observer of the 733 // Let the DeviceDisablingManager unregister itself as an observer of the
733 // CrosSettings singleton before it is destroyed. 734 // CrosSettings singleton before it is destroyed.
734 g_browser_process->platform_part()->ShutdownDeviceDisablingManager(); 735 g_browser_process->platform_part()->ShutdownDeviceDisablingManager();
735 736
736 // Let the AutomaticRebootManager unregister itself as an observer of several 737 // Let the AutomaticRebootManager unregister itself as an observer of several
737 // subsystems. 738 // subsystems.
738 g_browser_process->platform_part()->ShutdownAutomaticRebootManager(); 739 g_browser_process->platform_part()->ShutdownAutomaticRebootManager();
739 740
740 // Clean up dependency on CrosSettings and stop pending data fetches. 741 // 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. 774 // Destroy DBus services immediately after threads are stopped.
774 dbus_services_.reset(); 775 dbus_services_.reset();
775 776
776 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 777 ChromeBrowserMainPartsLinux::PostDestroyThreads();
777 778
778 // Destroy DeviceSettingsService after g_browser_process. 779 // Destroy DeviceSettingsService after g_browser_process.
779 DeviceSettingsService::Shutdown(); 780 DeviceSettingsService::Shutdown();
780 } 781 }
781 782
782 } // namespace chromeos 783 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698