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/shell.h" | 10 #include "ash/shell.h" |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 #include "chrome/common/chrome_version_info.h" | 88 #include "chrome/common/chrome_version_info.h" |
89 #include "chrome/common/logging_chrome.h" | 89 #include "chrome/common/logging_chrome.h" |
90 #include "chrome/common/pref_names.h" | 90 #include "chrome/common/pref_names.h" |
91 #include "chromeos/chromeos_switches.h" | 91 #include "chromeos/chromeos_switches.h" |
92 #include "chromeos/cryptohome/async_method_caller.h" | 92 #include "chromeos/cryptohome/async_method_caller.h" |
93 #include "chromeos/dbus/dbus_thread_manager.h" | 93 #include "chromeos/dbus/dbus_thread_manager.h" |
94 #include "chromeos/dbus/power_manager_client.h" | 94 #include "chromeos/dbus/power_manager_client.h" |
95 #include "chromeos/dbus/session_manager_client.h" | 95 #include "chromeos/dbus/session_manager_client.h" |
96 #include "chromeos/disks/disk_mount_manager.h" | 96 #include "chromeos/disks/disk_mount_manager.h" |
97 #include "chromeos/ime/xkeyboard.h" | 97 #include "chromeos/ime/xkeyboard.h" |
| 98 #include "chromeos/login/login_state.h" |
98 #include "chromeos/network/geolocation_handler.h" | 99 #include "chromeos/network/geolocation_handler.h" |
99 #include "chromeos/network/managed_network_configuration_handler.h" | 100 #include "chromeos/network/managed_network_configuration_handler.h" |
100 #include "chromeos/network/network_change_notifier_chromeos.h" | 101 #include "chromeos/network/network_change_notifier_chromeos.h" |
101 #include "chromeos/network/network_change_notifier_factory_chromeos.h" | 102 #include "chromeos/network/network_change_notifier_factory_chromeos.h" |
102 #include "chromeos/network/network_configuration_handler.h" | 103 #include "chromeos/network/network_configuration_handler.h" |
103 #include "chromeos/network/network_event_log.h" | 104 #include "chromeos/network/network_event_log.h" |
104 #include "chromeos/network/network_state_handler.h" | 105 #include "chromeos/network/network_state_handler.h" |
105 #include "content/public/browser/browser_thread.h" | 106 #include "content/public/browser/browser_thread.h" |
106 #include "content/public/browser/notification_service.h" | 107 #include "content/public/browser/notification_service.h" |
107 #include "content/public/browser/power_save_blocker.h" | 108 #include "content/public/browser/power_save_blocker.h" |
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
290 | 291 |
291 // This function and SystemKeyEventListener use InputMethodManager. | 292 // This function and SystemKeyEventListener use InputMethodManager. |
292 chromeos::input_method::Initialize( | 293 chromeos::input_method::Initialize( |
293 content::BrowserThread::GetMessageLoopProxyForThread( | 294 content::BrowserThread::GetMessageLoopProxyForThread( |
294 content::BrowserThread::UI), | 295 content::BrowserThread::UI), |
295 content::BrowserThread::GetMessageLoopProxyForThread( | 296 content::BrowserThread::GetMessageLoopProxyForThread( |
296 content::BrowserThread::FILE)); | 297 content::BrowserThread::FILE)); |
297 disks::DiskMountManager::Initialize(); | 298 disks::DiskMountManager::Initialize(); |
298 cryptohome::AsyncMethodCaller::Initialize(); | 299 cryptohome::AsyncMethodCaller::Initialize(); |
299 | 300 |
| 301 chromeos::LoginState::Initialize(); |
| 302 |
300 // Always initialize these handlers which should not conflict with | 303 // Always initialize these handlers which should not conflict with |
301 // NetworkLibrary. | 304 // NetworkLibrary. |
302 chromeos::network_event_log::Initialize(); | 305 chromeos::network_event_log::Initialize(); |
303 chromeos::GeolocationHandler::Initialize(); | 306 chromeos::GeolocationHandler::Initialize(); |
304 chromeos::NetworkStateHandler::Initialize(); | 307 chromeos::NetworkStateHandler::Initialize(); |
305 | 308 |
306 chromeos::NetworkConfigurationHandler::Initialize(); | 309 chromeos::NetworkConfigurationHandler::Initialize(); |
307 chromeos::ManagedNetworkConfigurationHandler::Initialize(); | 310 chromeos::ManagedNetworkConfigurationHandler::Initialize(); |
308 | 311 |
309 // Initialize the network change notifier for Chrome OS. The network | 312 // Initialize the network change notifier for Chrome OS. The network |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
346 if (cros_initialized_ && CrosLibrary::Get()) | 349 if (cros_initialized_ && CrosLibrary::Get()) |
347 CrosLibrary::Shutdown(); | 350 CrosLibrary::Shutdown(); |
348 | 351 |
349 chromeos::ManagedNetworkConfigurationHandler::Shutdown(); | 352 chromeos::ManagedNetworkConfigurationHandler::Shutdown(); |
350 chromeos::NetworkConfigurationHandler::Shutdown(); | 353 chromeos::NetworkConfigurationHandler::Shutdown(); |
351 | 354 |
352 chromeos::NetworkStateHandler::Shutdown(); | 355 chromeos::NetworkStateHandler::Shutdown(); |
353 chromeos::GeolocationHandler::Shutdown(); | 356 chromeos::GeolocationHandler::Shutdown(); |
354 chromeos::network_event_log::Shutdown(); | 357 chromeos::network_event_log::Shutdown(); |
355 | 358 |
| 359 chromeos::LoginState::Shutdown(); |
| 360 |
356 cryptohome::AsyncMethodCaller::Shutdown(); | 361 cryptohome::AsyncMethodCaller::Shutdown(); |
357 disks::DiskMountManager::Shutdown(); | 362 disks::DiskMountManager::Shutdown(); |
358 input_method::Shutdown(); | 363 input_method::Shutdown(); |
359 CrosDBusService::Shutdown(); | 364 CrosDBusService::Shutdown(); |
360 // NOTE: This must only be called if Initialize() was called. | 365 // NOTE: This must only be called if Initialize() was called. |
361 DBusThreadManager::Shutdown(); | 366 DBusThreadManager::Shutdown(); |
362 } | 367 } |
363 | 368 |
364 private: | 369 private: |
365 bool cros_initialized_; | 370 bool cros_initialized_; |
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
851 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); | 856 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); |
852 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); | 857 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); |
853 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); | 858 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); |
854 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); | 859 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); |
855 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); | 860 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); |
856 // This is necessary to start the experiment as a side effect. | 861 // This is necessary to start the experiment as a side effect. |
857 trial->group(); | 862 trial->group(); |
858 } | 863 } |
859 | 864 |
860 } // namespace chromeos | 865 } // namespace chromeos |
OLD | NEW |