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