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

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

Issue 15769004: Destroy the UserManager after ChromeBrowserMainPartsLinux::PostMainMessageLoopRun (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comment updated Created 7 years, 6 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
« no previous file with comments | « no previous file | no next file » | 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 854 matching lines...) Expand 10 before | Expand all | Expand 10 after
865 865
866 // Let the AutomaticRebootManager unregister itself as an observer of several 866 // Let the AutomaticRebootManager unregister itself as an observer of several
867 // subsystems. 867 // subsystems.
868 automatic_reboot_manager_.reset(); 868 automatic_reboot_manager_.reset();
869 869
870 // Clean up dependency on CrosSettings and stop pending data fetches. 870 // Clean up dependency on CrosSettings and stop pending data fetches.
871 KioskAppManager::Shutdown(); 871 KioskAppManager::Shutdown();
872 872
873 chrome::CloseAsh(); 873 chrome::CloseAsh();
874 874
875 // Destroy the UserManager after ash has been destroyed. 875 ChromeBrowserMainPartsLinux::PostMainMessageLoopRun();
876
877 // Destroy the UserManager after ash has been destroyed and
878 // ChromeBrowserMainPartsLinux::PostMainMessageLoopRun run. The latter might
879 // trigger MergeSessionThrottle::ShouldShowMergeSessionPage, which requires
880 // the UserManager to exist.
876 UserManager::Destroy(); 881 UserManager::Destroy();
877
878 ChromeBrowserMainPartsLinux::PostMainMessageLoopRun();
879 } 882 }
880 883
881 void ChromeBrowserMainPartsChromeos::PostDestroyThreads() { 884 void ChromeBrowserMainPartsChromeos::PostDestroyThreads() {
882 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 885 ChromeBrowserMainPartsLinux::PostDestroyThreads();
883 // Destroy DeviceSettingsService after g_browser_process. 886 // Destroy DeviceSettingsService after g_browser_process.
884 DeviceSettingsService::Shutdown(); 887 DeviceSettingsService::Shutdown();
885 } 888 }
886 889
887 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() { 890 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() {
888 SetupZramFieldTrial(); 891 SetupZramFieldTrial();
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
927 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); 930 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0);
928 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); 931 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0);
929 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); 932 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0);
930 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); 933 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0);
931 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); 934 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0);
932 // This is necessary to start the experiment as a side effect. 935 // This is necessary to start the experiment as a side effect.
933 trial->group(); 936 trial->group();
934 } 937 }
935 938
936 } // namespace chromeos 939 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698