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

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

Issue 16910002: Destroy StorageMonitorCros before DBusServices (take 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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 | chrome/browser/media_galleries/media_galleries_dialog_controller.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 791 matching lines...) Expand 10 before | Expand all | Expand 10 after
802 // Let classes unregister themselves as observers of the ash::Shell singleton 802 // Let classes unregister themselves as observers of the ash::Shell singleton
803 // before the shell is destroyed. 803 // before the shell is destroyed.
804 user_activity_notifier_.reset(); 804 user_activity_notifier_.reset();
805 video_activity_notifier_.reset(); 805 video_activity_notifier_.reset();
806 display_configuration_observer_.reset(); 806 display_configuration_observer_.reset();
807 807
808 // Detach D-Bus clients before DBusThreadManager is shut down. 808 // Detach D-Bus clients before DBusThreadManager is shut down.
809 power_button_observer_.reset(); 809 power_button_observer_.reset();
810 screensaver_controller_.reset(); 810 screensaver_controller_.reset();
811 idle_action_warning_observer_.reset(); 811 idle_action_warning_observer_.reset();
812 storage_monitor_.reset();
812 813
813 // Delete ContactManager while |g_browser_process| is still alive. 814 // Delete ContactManager while |g_browser_process| is still alive.
814 contact_manager_.reset(); 815 contact_manager_.reset();
815 816
816 MagnificationManager::Shutdown(); 817 MagnificationManager::Shutdown();
817 AccessibilityManager::Shutdown(); 818 AccessibilityManager::Shutdown();
818 819
819 // Let the UserManager and WallpaperManager unregister itself as an observer 820 // Let the UserManager and WallpaperManager unregister itself as an observer
820 // of the CrosSettings singleton before it is destroyed. 821 // of the CrosSettings singleton before it is destroyed.
821 UserManager::Get()->Shutdown(); 822 UserManager::Get()->Shutdown();
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); 887 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0);
887 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); 888 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0);
888 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); 889 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0);
889 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); 890 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0);
890 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); 891 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0);
891 // This is necessary to start the experiment as a side effect. 892 // This is necessary to start the experiment as a side effect.
892 trial->group(); 893 trial->group();
893 } 894 }
894 895
895 } // namespace chromeos 896 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/media_galleries/media_galleries_dialog_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698