| 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 #include "chromeos/disks/disk_mount_manager.h" | 104 #include "chromeos/disks/disk_mount_manager.h" |
| 105 #include "chromeos/ime/input_method_manager.h" | 105 #include "chromeos/ime/input_method_manager.h" |
| 106 #include "chromeos/ime/xkeyboard.h" | 106 #include "chromeos/ime/xkeyboard.h" |
| 107 #include "chromeos/login/login_state.h" | 107 #include "chromeos/login/login_state.h" |
| 108 #include "chromeos/network/cert_loader.h" | 108 #include "chromeos/network/cert_loader.h" |
| 109 #include "chromeos/network/geolocation_handler.h" | 109 #include "chromeos/network/geolocation_handler.h" |
| 110 #include "chromeos/network/managed_network_configuration_handler.h" | 110 #include "chromeos/network/managed_network_configuration_handler.h" |
| 111 #include "chromeos/network/network_change_notifier_chromeos.h" | 111 #include "chromeos/network/network_change_notifier_chromeos.h" |
| 112 #include "chromeos/network/network_change_notifier_factory_chromeos.h" | 112 #include "chromeos/network/network_change_notifier_factory_chromeos.h" |
| 113 #include "chromeos/network/network_configuration_handler.h" | 113 #include "chromeos/network/network_configuration_handler.h" |
| 114 #include "chromeos/network/network_connection_handler.h" |
| 114 #include "chromeos/network/network_event_log.h" | 115 #include "chromeos/network/network_event_log.h" |
| 115 #include "chromeos/network/network_profile_handler.h" | 116 #include "chromeos/network/network_profile_handler.h" |
| 116 #include "chromeos/network/network_state_handler.h" | 117 #include "chromeos/network/network_state_handler.h" |
| 117 #include "content/public/browser/browser_thread.h" | 118 #include "content/public/browser/browser_thread.h" |
| 118 #include "content/public/browser/notification_service.h" | 119 #include "content/public/browser/notification_service.h" |
| 119 #include "content/public/browser/power_save_blocker.h" | 120 #include "content/public/browser/power_save_blocker.h" |
| 120 #include "content/public/common/main_function_params.h" | 121 #include "content/public/common/main_function_params.h" |
| 121 #include "grit/platform_locale_settings.h" | 122 #include "grit/platform_locale_settings.h" |
| 122 #include "net/base/network_change_notifier.h" | 123 #include "net/base/network_change_notifier.h" |
| 123 #include "net/url_request/url_request.h" | 124 #include "net/url_request/url_request.h" |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 322 // Always initialize these handlers which should not conflict with | 323 // Always initialize these handlers which should not conflict with |
| 323 // NetworkLibrary. | 324 // NetworkLibrary. |
| 324 network_event_log::Initialize(); | 325 network_event_log::Initialize(); |
| 325 GeolocationHandler::Initialize(); | 326 GeolocationHandler::Initialize(); |
| 326 NetworkStateHandler::Initialize(); | 327 NetworkStateHandler::Initialize(); |
| 327 | 328 |
| 328 NetworkProfileHandler* profile_handler = | 329 NetworkProfileHandler* profile_handler = |
| 329 NetworkProfileHandler::Initialize(); | 330 NetworkProfileHandler::Initialize(); |
| 330 NetworkConfigurationHandler::Initialize(); | 331 NetworkConfigurationHandler::Initialize(); |
| 331 ManagedNetworkConfigurationHandler::Initialize(profile_handler); | 332 ManagedNetworkConfigurationHandler::Initialize(profile_handler); |
| 333 NetworkConnectionHandler::Initialize(); |
| 332 | 334 |
| 333 // Initialize the network change notifier for Chrome OS. The network | 335 // Initialize the network change notifier for Chrome OS. The network |
| 334 // change notifier starts to monitor changes from the power manager and | 336 // change notifier starts to monitor changes from the power manager and |
| 335 // the network manager. | 337 // the network manager. |
| 336 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 338 if (!CommandLine::ForCurrentProcess()->HasSwitch( |
| 337 chromeos::switches::kDisableNewNetworkChangeNotifier)) { | 339 chromeos::switches::kDisableNewNetworkChangeNotifier)) { |
| 338 NetworkChangeNotifierFactoryChromeos::GetInstance()->Initialize(); | 340 NetworkChangeNotifierFactoryChromeos::GetInstance()->Initialize(); |
| 339 } else { | 341 } else { |
| 340 CrosNetworkChangeNotifierFactory::GetInstance()->Init(); | 342 CrosNetworkChangeNotifierFactory::GetInstance()->Init(); |
| 341 } | 343 } |
| (...skipping 23 matching lines...) Expand all Loading... |
| 365 // CrosLibrary is shut down before DBusThreadManager even though it | 367 // CrosLibrary is shut down before DBusThreadManager even though it |
| 366 // is initialized first becuase some of its libraries depend on DBus | 368 // is initialized first becuase some of its libraries depend on DBus |
| 367 // clients. | 369 // clients. |
| 368 // TODO(hashimoto): Resolve this situation by removing CrosLibrary. | 370 // TODO(hashimoto): Resolve this situation by removing CrosLibrary. |
| 369 // (crosbug.com/26160) | 371 // (crosbug.com/26160) |
| 370 if (cros_initialized_ && CrosLibrary::Get()) | 372 if (cros_initialized_ && CrosLibrary::Get()) |
| 371 CrosLibrary::Shutdown(); | 373 CrosLibrary::Shutdown(); |
| 372 | 374 |
| 373 ManagedNetworkConfigurationHandler::Shutdown(); | 375 ManagedNetworkConfigurationHandler::Shutdown(); |
| 374 NetworkConfigurationHandler::Shutdown(); | 376 NetworkConfigurationHandler::Shutdown(); |
| 377 NetworkConnectionHandler::Shutdown(); |
| 375 NetworkProfileHandler::Shutdown(); | 378 NetworkProfileHandler::Shutdown(); |
| 376 | 379 |
| 377 NetworkStateHandler::Shutdown(); | 380 NetworkStateHandler::Shutdown(); |
| 378 GeolocationHandler::Shutdown(); | 381 GeolocationHandler::Shutdown(); |
| 379 network_event_log::Shutdown(); | 382 network_event_log::Shutdown(); |
| 380 | 383 |
| 381 cryptohome::AsyncMethodCaller::Shutdown(); | 384 cryptohome::AsyncMethodCaller::Shutdown(); |
| 382 disks::DiskMountManager::Shutdown(); | 385 disks::DiskMountManager::Shutdown(); |
| 383 input_method::Shutdown(); | 386 input_method::Shutdown(); |
| 384 CryptohomeLibrary::Shutdown(); | 387 CryptohomeLibrary::Shutdown(); |
| (...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 895 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); | 898 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); |
| 896 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); | 899 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); |
| 897 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); | 900 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); |
| 898 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); | 901 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); |
| 899 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); | 902 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); |
| 900 // This is necessary to start the experiment as a side effect. | 903 // This is necessary to start the experiment as a side effect. |
| 901 trial->group(); | 904 trial->group(); |
| 902 } | 905 } |
| 903 | 906 |
| 904 } // namespace chromeos | 907 } // namespace chromeos |
| OLD | NEW |