| 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 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 NetworkHandler::Initialize(); | 175 NetworkHandler::Initialize(); |
| 176 CertLibrary::Initialize(); | 176 CertLibrary::Initialize(); |
| 177 | 177 |
| 178 // Initialize the network change notifier for Chrome OS. The network | 178 // Initialize the network change notifier for Chrome OS. The network |
| 179 // change notifier starts to monitor changes from the power manager and | 179 // change notifier starts to monitor changes from the power manager and |
| 180 // the network manager. | 180 // the network manager. |
| 181 NetworkChangeNotifierFactoryChromeos::GetInstance()->Initialize(); | 181 NetworkChangeNotifierFactoryChromeos::GetInstance()->Initialize(); |
| 182 | 182 |
| 183 // Initialize the NetworkConnect handler. | 183 // Initialize the NetworkConnect handler. |
| 184 network_connect_delegate_.reset(new NetworkConnectDelegateChromeOS); | 184 network_connect_delegate_.reset(new NetworkConnectDelegateChromeOS); |
| 185 ash::NetworkConnect::Initialize(network_connect_delegate_.get()); | 185 ui::NetworkConnect::Initialize(network_connect_delegate_.get()); |
| 186 | 186 |
| 187 // Likewise, initialize the upgrade detector for Chrome OS. The upgrade | 187 // Likewise, initialize the upgrade detector for Chrome OS. The upgrade |
| 188 // detector starts to monitor changes from the update engine. | 188 // detector starts to monitor changes from the update engine. |
| 189 UpgradeDetectorChromeos::GetInstance()->Init(); | 189 UpgradeDetectorChromeos::GetInstance()->Init(); |
| 190 | 190 |
| 191 // Initialize the device settings service so that we'll take actions per | 191 // Initialize the device settings service so that we'll take actions per |
| 192 // signals sent from the session manager. This needs to happen before | 192 // signals sent from the session manager. This needs to happen before |
| 193 // g_browser_process initializes BrowserPolicyConnector. | 193 // g_browser_process initializes BrowserPolicyConnector. |
| 194 DeviceSettingsService::Initialize(); | 194 DeviceSettingsService::Initialize(); |
| 195 DeviceSettingsService::Get()->SetSessionManager( | 195 DeviceSettingsService::Get()->SetSessionManager( |
| 196 DBusThreadManager::Get()->GetSessionManagerClient(), | 196 DBusThreadManager::Get()->GetSessionManagerClient(), |
| 197 OwnerSettingsServiceChromeOSFactory::GetInstance()->GetOwnerKeyUtil()); | 197 OwnerSettingsServiceChromeOSFactory::GetInstance()->GetOwnerKeyUtil()); |
| 198 } | 198 } |
| 199 | 199 |
| 200 ~DBusServices() { | 200 ~DBusServices() { |
| 201 ash::NetworkConnect::Shutdown(); | 201 ui::NetworkConnect::Shutdown(); |
| 202 network_connect_delegate_.reset(); | 202 network_connect_delegate_.reset(); |
| 203 | 203 |
| 204 CertLibrary::Shutdown(); | 204 CertLibrary::Shutdown(); |
| 205 NetworkHandler::Shutdown(); | 205 NetworkHandler::Shutdown(); |
| 206 | 206 |
| 207 cryptohome::AsyncMethodCaller::Shutdown(); | 207 cryptohome::AsyncMethodCaller::Shutdown(); |
| 208 disks::DiskMountManager::Shutdown(); | 208 disks::DiskMountManager::Shutdown(); |
| 209 | 209 |
| 210 SystemSaltGetter::Shutdown(); | 210 SystemSaltGetter::Shutdown(); |
| 211 LoginState::Shutdown(); | 211 LoginState::Shutdown(); |
| (...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 775 // Destroy DBus services immediately after threads are stopped. | 775 // Destroy DBus services immediately after threads are stopped. |
| 776 dbus_services_.reset(); | 776 dbus_services_.reset(); |
| 777 | 777 |
| 778 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 778 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 779 | 779 |
| 780 // Destroy DeviceSettingsService after g_browser_process. | 780 // Destroy DeviceSettingsService after g_browser_process. |
| 781 DeviceSettingsService::Shutdown(); | 781 DeviceSettingsService::Shutdown(); |
| 782 } | 782 } |
| 783 | 783 |
| 784 } // namespace chromeos | 784 } // namespace chromeos |
| OLD | NEW |