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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 #include "chrome/browser/storage_monitor/storage_monitor_chromeos.h" | 85 #include "chrome/browser/storage_monitor/storage_monitor_chromeos.h" |
86 #include "chrome/common/chrome_notification_types.h" | 86 #include "chrome/common/chrome_notification_types.h" |
87 #include "chrome/common/chrome_paths.h" | 87 #include "chrome/common/chrome_paths.h" |
88 #include "chrome/common/chrome_switches.h" | 88 #include "chrome/common/chrome_switches.h" |
89 #include "chrome/common/chrome_version_info.h" | 89 #include "chrome/common/chrome_version_info.h" |
90 #include "chrome/common/logging_chrome.h" | 90 #include "chrome/common/logging_chrome.h" |
91 #include "chrome/common/pref_names.h" | 91 #include "chrome/common/pref_names.h" |
92 #include "chromeos/audio/audio_pref_handler.h" | 92 #include "chromeos/audio/audio_pref_handler.h" |
93 #include "chromeos/chromeos_switches.h" | 93 #include "chromeos/chromeos_switches.h" |
94 #include "chromeos/cryptohome/async_method_caller.h" | 94 #include "chromeos/cryptohome/async_method_caller.h" |
| 95 #include "chromeos/cryptohome/cryptohome_library.h" |
95 #include "chromeos/dbus/dbus_thread_manager.h" | 96 #include "chromeos/dbus/dbus_thread_manager.h" |
96 #include "chromeos/dbus/power_manager_client.h" | 97 #include "chromeos/dbus/power_manager_client.h" |
97 #include "chromeos/dbus/session_manager_client.h" | 98 #include "chromeos/dbus/session_manager_client.h" |
98 #include "chromeos/disks/disk_mount_manager.h" | 99 #include "chromeos/disks/disk_mount_manager.h" |
99 #include "chromeos/ime/xkeyboard.h" | 100 #include "chromeos/ime/xkeyboard.h" |
100 #include "chromeos/login/login_state.h" | 101 #include "chromeos/login/login_state.h" |
101 #include "chromeos/network/geolocation_handler.h" | 102 #include "chromeos/network/geolocation_handler.h" |
102 #include "chromeos/network/managed_network_configuration_handler.h" | 103 #include "chromeos/network/managed_network_configuration_handler.h" |
103 #include "chromeos/network/network_change_notifier_chromeos.h" | 104 #include "chromeos/network/network_change_notifier_chromeos.h" |
104 #include "chromeos/network/network_change_notifier_factory_chromeos.h" | 105 #include "chromeos/network/network_change_notifier_factory_chromeos.h" |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
284 const bool use_stub = !base::chromeos::IsRunningOnChromeOS(); | 285 const bool use_stub = !base::chromeos::IsRunningOnChromeOS(); |
285 CrosLibrary::Initialize(use_stub); | 286 CrosLibrary::Initialize(use_stub); |
286 cros_initialized_ = true; | 287 cros_initialized_ = true; |
287 } | 288 } |
288 | 289 |
289 // Initialize DBusThreadManager for the browser. This must be done after | 290 // Initialize DBusThreadManager for the browser. This must be done after |
290 // the main message loop is started, as it uses the message loop. | 291 // the main message loop is started, as it uses the message loop. |
291 DBusThreadManager::Initialize(); | 292 DBusThreadManager::Initialize(); |
292 CrosDBusService::Initialize(); | 293 CrosDBusService::Initialize(); |
293 | 294 |
| 295 CryptohomeLibrary::Initialize(); |
| 296 |
294 // This function and SystemKeyEventListener use InputMethodManager. | 297 // This function and SystemKeyEventListener use InputMethodManager. |
295 chromeos::input_method::Initialize( | 298 chromeos::input_method::Initialize( |
296 content::BrowserThread::GetMessageLoopProxyForThread( | 299 content::BrowserThread::GetMessageLoopProxyForThread( |
297 content::BrowserThread::UI), | 300 content::BrowserThread::UI), |
298 content::BrowserThread::GetMessageLoopProxyForThread( | 301 content::BrowserThread::GetMessageLoopProxyForThread( |
299 content::BrowserThread::FILE)); | 302 content::BrowserThread::FILE)); |
300 disks::DiskMountManager::Initialize(); | 303 disks::DiskMountManager::Initialize(); |
301 cryptohome::AsyncMethodCaller::Initialize(); | 304 cryptohome::AsyncMethodCaller::Initialize(); |
302 | 305 |
303 chromeos::LoginState::Initialize(); | 306 chromeos::LoginState::Initialize(); |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
356 | 359 |
357 chromeos::NetworkStateHandler::Shutdown(); | 360 chromeos::NetworkStateHandler::Shutdown(); |
358 chromeos::GeolocationHandler::Shutdown(); | 361 chromeos::GeolocationHandler::Shutdown(); |
359 chromeos::network_event_log::Shutdown(); | 362 chromeos::network_event_log::Shutdown(); |
360 | 363 |
361 chromeos::LoginState::Shutdown(); | 364 chromeos::LoginState::Shutdown(); |
362 | 365 |
363 cryptohome::AsyncMethodCaller::Shutdown(); | 366 cryptohome::AsyncMethodCaller::Shutdown(); |
364 disks::DiskMountManager::Shutdown(); | 367 disks::DiskMountManager::Shutdown(); |
365 input_method::Shutdown(); | 368 input_method::Shutdown(); |
| 369 CryptohomeLibrary::Shutdown(); |
366 CrosDBusService::Shutdown(); | 370 CrosDBusService::Shutdown(); |
367 // NOTE: This must only be called if Initialize() was called. | 371 // NOTE: This must only be called if Initialize() was called. |
368 DBusThreadManager::Shutdown(); | 372 DBusThreadManager::Shutdown(); |
369 } | 373 } |
370 | 374 |
371 private: | 375 private: |
372 bool cros_initialized_; | 376 bool cros_initialized_; |
373 | 377 |
374 DISALLOW_COPY_AND_ASSIGN(DBusServices); | 378 DISALLOW_COPY_AND_ASSIGN(DBusServices); |
375 }; | 379 }; |
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
859 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); | 863 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); |
860 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); | 864 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); |
861 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); | 865 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); |
862 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); | 866 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); |
863 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); | 867 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); |
864 // This is necessary to start the experiment as a side effect. | 868 // This is necessary to start the experiment as a side effect. |
865 trial->group(); | 869 trial->group(); |
866 } | 870 } |
867 | 871 |
868 } // namespace chromeos | 872 } // namespace chromeos |
OLD | NEW |