| OLD | NEW |
| 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 #include "chromeos/disks/disk_mount_manager.h" | 101 #include "chromeos/disks/disk_mount_manager.h" |
| 102 #include "chromeos/login/login_state.h" | 102 #include "chromeos/login/login_state.h" |
| 103 #include "chromeos/login/user_names.h" | 103 #include "chromeos/login/user_names.h" |
| 104 #include "chromeos/login_event_recorder.h" | 104 #include "chromeos/login_event_recorder.h" |
| 105 #include "chromeos/network/network_change_notifier_chromeos.h" | 105 #include "chromeos/network/network_change_notifier_chromeos.h" |
| 106 #include "chromeos/network/network_change_notifier_factory_chromeos.h" | 106 #include "chromeos/network/network_change_notifier_factory_chromeos.h" |
| 107 #include "chromeos/network/network_handler.h" | 107 #include "chromeos/network/network_handler.h" |
| 108 #include "chromeos/network/portal_detector/network_portal_detector_stub.h" | 108 #include "chromeos/network/portal_detector/network_portal_detector_stub.h" |
| 109 #include "chromeos/system/statistics_provider.h" | 109 #include "chromeos/system/statistics_provider.h" |
| 110 #include "chromeos/tpm/tpm_token_loader.h" | 110 #include "chromeos/tpm/tpm_token_loader.h" |
| 111 #include "components/browser_sync/common/browser_sync_switches.h" |
| 111 #include "components/device_event_log/device_event_log.h" | 112 #include "components/device_event_log/device_event_log.h" |
| 112 #include "components/metrics/metrics_service.h" | 113 #include "components/metrics/metrics_service.h" |
| 113 #include "components/ownership/owner_key_util.h" | 114 #include "components/ownership/owner_key_util.h" |
| 114 #include "components/session_manager/core/session_manager.h" | 115 #include "components/session_manager/core/session_manager.h" |
| 115 #include "components/signin/core/account_id/account_id.h" | 116 #include "components/signin/core/account_id/account_id.h" |
| 116 #include "components/user_manager/user.h" | 117 #include "components/user_manager/user.h" |
| 117 #include "components/user_manager/user_manager.h" | 118 #include "components/user_manager/user_manager.h" |
| 118 #include "components/wallpaper/wallpaper_manager_base.h" | 119 #include "components/wallpaper/wallpaper_manager_base.h" |
| 119 #include "content/public/browser/browser_thread.h" | 120 #include "content/public/browser/browser_thread.h" |
| 120 #include "content/public/browser/notification_service.h" | 121 #include "content/public/browser/notification_service.h" |
| (...skipping 684 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 805 // Destroy DBus services immediately after threads are stopped. | 806 // Destroy DBus services immediately after threads are stopped. |
| 806 dbus_services_.reset(); | 807 dbus_services_.reset(); |
| 807 | 808 |
| 808 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 809 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 809 | 810 |
| 810 // Destroy DeviceSettingsService after g_browser_process. | 811 // Destroy DeviceSettingsService after g_browser_process. |
| 811 DeviceSettingsService::Shutdown(); | 812 DeviceSettingsService::Shutdown(); |
| 812 } | 813 } |
| 813 | 814 |
| 814 } // namespace chromeos | 815 } // namespace chromeos |
| OLD | NEW |