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" |
11 #include "ash/shell.h" | 11 #include "ash/shell.h" |
12 #include "base/bind.h" | 12 #include "base/bind.h" |
13 #include "base/callback.h" | 13 #include "base/callback.h" |
14 #include "base/chromeos/chromeos_version.h" | 14 #include "base/chromeos/chromeos_version.h" |
15 #include "base/command_line.h" | 15 #include "base/command_line.h" |
16 #include "base/file_util.h" | 16 #include "base/file_util.h" |
17 #include "base/lazy_instance.h" | 17 #include "base/lazy_instance.h" |
18 #include "base/linux_util.h" | 18 #include "base/linux_util.h" |
19 #include "base/message_loop/message_loop.h" | 19 #include "base/message_loop/message_loop.h" |
20 #include "base/path_service.h" | 20 #include "base/path_service.h" |
21 #include "base/prefs/pref_service.h" | 21 #include "base/prefs/pref_service.h" |
22 #include "base/strings/string_number_conversions.h" | 22 #include "base/strings/string_number_conversions.h" |
23 #include "base/strings/string_split.h" | 23 #include "base/strings/string_split.h" |
| 24 #include "base/threading/worker_pool.h" |
24 #include "chrome/browser/browser_process.h" | 25 #include "chrome/browser/browser_process.h" |
25 #include "chrome/browser/browser_process_platform_part_chromeos.h" | 26 #include "chrome/browser/browser_process_platform_part_chromeos.h" |
26 #include "chrome/browser/chrome_notification_types.h" | 27 #include "chrome/browser/chrome_notification_types.h" |
27 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" | 28 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
28 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" | 29 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" |
29 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" | 30 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" |
30 #include "chrome/browser/chromeos/app_mode/kiosk_app_launcher.h" | 31 #include "chrome/browser/chromeos/app_mode/kiosk_app_launcher.h" |
31 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 32 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
32 #include "chrome/browser/chromeos/audio/audio_handler.h" | 33 #include "chrome/browser/chromeos/audio/audio_handler.h" |
33 #include "chrome/browser/chromeos/boot_times_loader.h" | 34 #include "chrome/browser/chromeos/boot_times_loader.h" |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
271 } | 272 } |
272 } | 273 } |
273 | 274 |
274 // Initialize DBusThreadManager for the browser. This must be done after | 275 // Initialize DBusThreadManager for the browser. This must be done after |
275 // the main message loop is started, as it uses the message loop. | 276 // the main message loop is started, as it uses the message loop. |
276 DBusThreadManager::Initialize(); | 277 DBusThreadManager::Initialize(); |
277 CrosDBusService::Initialize(); | 278 CrosDBusService::Initialize(); |
278 | 279 |
279 LoginState::Initialize(); | 280 LoginState::Initialize(); |
280 CryptohomeLibrary::Initialize(); | 281 CryptohomeLibrary::Initialize(); |
281 CertLoader::Initialize(); | 282 CertLoader::Initialize( |
| 283 base::WorkerPool::GetTaskRunner(true /* task is slow */)); |
282 | 284 |
283 // This function and SystemKeyEventListener use InputMethodManager. | 285 // This function and SystemKeyEventListener use InputMethodManager. |
284 chromeos::input_method::Initialize( | 286 chromeos::input_method::Initialize( |
285 content::BrowserThread::GetMessageLoopProxyForThread( | 287 content::BrowserThread::GetMessageLoopProxyForThread( |
286 content::BrowserThread::UI), | 288 content::BrowserThread::UI), |
287 content::BrowserThread::GetMessageLoopProxyForThread( | 289 content::BrowserThread::GetMessageLoopProxyForThread( |
288 content::BrowserThread::FILE)); | 290 content::BrowserThread::FILE)); |
289 disks::DiskMountManager::Initialize(); | 291 disks::DiskMountManager::Initialize(); |
290 cryptohome::AsyncMethodCaller::Initialize(); | 292 cryptohome::AsyncMethodCaller::Initialize(); |
291 | 293 |
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
838 | 840 |
839 // Destroy DeviceSettingsService after g_browser_process. | 841 // Destroy DeviceSettingsService after g_browser_process. |
840 DeviceSettingsService::Shutdown(); | 842 DeviceSettingsService::Shutdown(); |
841 } | 843 } |
842 | 844 |
843 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() { | 845 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() { |
844 default_pinned_apps_field_trial::SetupTrial(); | 846 default_pinned_apps_field_trial::SetupTrial(); |
845 } | 847 } |
846 | 848 |
847 } // namespace chromeos | 849 } // namespace chromeos |
OLD | NEW |