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

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

Issue 23678007: OAuth2LoginManager+MergeSessionThrottle hardening, multi-profle support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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 | Annotate | Revision Log
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 681 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 } 692 }
693 693
694 // Shut down services before the browser process, etc are destroyed. 694 // Shut down services before the browser process, etc are destroyed.
695 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { 695 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
696 BootTimesLoader::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true); 696 BootTimesLoader::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true);
697 697
698 g_browser_process->platform_part()->oom_priority_manager()->Stop(); 698 g_browser_process->platform_part()->oom_priority_manager()->Stop();
699 699
700 swap_metrics_.reset(); 700 swap_metrics_.reset();
701 701
702 // Stops LoginUtils background fetchers. This is needed because IO thread is
703 // going to stop soon after this function. The pending background jobs could
704 // cause it to crash during shutdown.
705 LoginUtils::Get()->StopBackgroundFetchers();
706
707 // Stops all in-flight OAuth2 token fetchers before the IO thread stops. 702 // Stops all in-flight OAuth2 token fetchers before the IO thread stops.
708 DeviceOAuth2TokenServiceFactory::Shutdown(); 703 DeviceOAuth2TokenServiceFactory::Shutdown();
709 704
710 // Shutdown the upgrade detector for Chrome OS. The upgrade detector 705 // Shutdown the upgrade detector for Chrome OS. The upgrade detector
711 // stops monitoring changes from the update engine. 706 // stops monitoring changes from the update engine.
712 if (UpgradeDetectorChromeos::GetInstance()) 707 if (UpgradeDetectorChromeos::GetInstance())
713 UpgradeDetectorChromeos::GetInstance()->Shutdown(); 708 UpgradeDetectorChromeos::GetInstance()->Shutdown();
714 709
715 // Shutdown the network change notifier for Chrome OS. The network 710 // Shutdown the network change notifier for Chrome OS. The network
716 // change notifier stops monitoring changes from the power manager and 711 // change notifier stops monitoring changes from the power manager and
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
800 795
801 // Destroy DeviceSettingsService after g_browser_process. 796 // Destroy DeviceSettingsService after g_browser_process.
802 DeviceSettingsService::Shutdown(); 797 DeviceSettingsService::Shutdown();
803 } 798 }
804 799
805 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() { 800 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() {
806 default_pinned_apps_field_trial::SetupTrial(); 801 default_pinned_apps_field_trial::SetupTrial();
807 } 802 }
808 803
809 } // namespace chromeos 804 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698