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 <stddef.h> | 7 #include <stddef.h> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 15 matching lines...) Expand all Loading... |
26 #include "base/task_runner_util.h" | 26 #include "base/task_runner_util.h" |
27 #include "chrome/browser/browser_process.h" | 27 #include "chrome/browser/browser_process.h" |
28 #include "chrome/browser/browser_process_platform_part_chromeos.h" | 28 #include "chrome/browser/browser_process_platform_part_chromeos.h" |
29 #include "chrome/browser/chrome_notification_types.h" | 29 #include "chrome/browser/chrome_notification_types.h" |
30 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" | 30 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
31 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" | 31 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" |
32 #include "chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.h
" | 32 #include "chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.h
" |
33 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" | 33 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" |
34 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 34 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
35 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification
.h" | 35 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification
.h" |
| 36 #include "chrome/browser/chromeos/arc/arc_auth_service_impl.h" |
36 #include "chrome/browser/chromeos/arc/arc_settings_bridge_impl.h" | 37 #include "chrome/browser/chromeos/arc/arc_settings_bridge_impl.h" |
37 #include "chrome/browser/chromeos/boot_times_recorder.h" | 38 #include "chrome/browser/chromeos/boot_times_recorder.h" |
38 #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate.
h" | 39 #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate.
h" |
39 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_del
egate.h" | 40 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_del
egate.h" |
40 #include "chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h" | 41 #include "chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h" |
41 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h" | 42 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h" |
42 #include "chrome/browser/chromeos/events/event_rewriter.h" | 43 #include "chrome/browser/chromeos/events/event_rewriter.h" |
43 #include "chrome/browser/chromeos/events/event_rewriter_controller.h" | 44 #include "chrome/browser/chromeos/events/event_rewriter_controller.h" |
44 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" | 45 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" |
45 #include "chrome/browser/chromeos/extensions/default_app_order.h" | 46 #include "chrome/browser/chromeos/extensions/default_app_order.h" |
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
388 load_oem_statistics); | 389 load_oem_statistics); |
389 | 390 |
390 base::FilePath downloads_directory; | 391 base::FilePath downloads_directory; |
391 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); | 392 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); |
392 | 393 |
393 DeviceOAuth2TokenServiceFactory::Initialize(); | 394 DeviceOAuth2TokenServiceFactory::Initialize(); |
394 | 395 |
395 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); | 396 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); |
396 | 397 |
397 arc_service_manager_.reset(new arc::ArcServiceManager( | 398 arc_service_manager_.reset(new arc::ArcServiceManager( |
| 399 make_scoped_ptr(new arc::ArcAuthServiceImpl()), |
398 make_scoped_ptr(new arc::ArcSettingsBridgeImpl()))); | 400 make_scoped_ptr(new arc::ArcSettingsBridgeImpl()))); |
399 arc_service_manager_->arc_bridge_service()->DetectAvailability(); | 401 arc_service_manager_->arc_bridge_service()->DetectAvailability(); |
400 | 402 |
401 chromeos::ResourceReporter::GetInstance()->StartMonitoring(); | 403 chromeos::ResourceReporter::GetInstance()->StartMonitoring(); |
402 | 404 |
403 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); | 405 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); |
404 } | 406 } |
405 | 407 |
406 void ChromeBrowserMainPartsChromeos::PreProfileInit() { | 408 void ChromeBrowserMainPartsChromeos::PreProfileInit() { |
407 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 409 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
826 // Destroy DBus services immediately after threads are stopped. | 828 // Destroy DBus services immediately after threads are stopped. |
827 dbus_services_.reset(); | 829 dbus_services_.reset(); |
828 | 830 |
829 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 831 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
830 | 832 |
831 // Destroy DeviceSettingsService after g_browser_process. | 833 // Destroy DeviceSettingsService after g_browser_process. |
832 DeviceSettingsService::Shutdown(); | 834 DeviceSettingsService::Shutdown(); |
833 } | 835 } |
834 | 836 |
835 } // namespace chromeos | 837 } // namespace chromeos |
OLD | NEW |