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