Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(690)

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 1553613002: Add ArcAuthService to handle IPC request from ARC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move to chrome/ Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 #include "chromeos/login/user_names.h" 106 #include "chromeos/login/user_names.h"
106 #include "chromeos/login_event_recorder.h" 107 #include "chromeos/login_event_recorder.h"
107 #include "chromeos/network/network_change_notifier_chromeos.h" 108 #include "chromeos/network/network_change_notifier_chromeos.h"
108 #include "chromeos/network/network_change_notifier_factory_chromeos.h" 109 #include "chromeos/network/network_change_notifier_factory_chromeos.h"
109 #include "chromeos/network/network_handler.h" 110 #include "chromeos/network/network_handler.h"
110 #include "chromeos/network/portal_detector/network_portal_detector_stub.h" 111 #include "chromeos/network/portal_detector/network_portal_detector_stub.h"
111 #include "chromeos/system/statistics_provider.h" 112 #include "chromeos/system/statistics_provider.h"
112 #include "chromeos/tpm/tpm_token_loader.h" 113 #include "chromeos/tpm/tpm_token_loader.h"
113 #include "components/arc/arc_bridge_service.h" 114 #include "components/arc/arc_bridge_service.h"
114 #include "components/arc/arc_service_manager.h" 115 #include "components/arc/arc_service_manager.h"
116 #include "components/arc/auth/arc_auth_service.h"
Luis Héctor Chávez 2016/01/04 21:26:21 Not needed anymore?
victorhsieh 2016/01/04 21:31:28 Done.
115 #include "components/arc/settings/arc_settings_bridge.h" 117 #include "components/arc/settings/arc_settings_bridge.h"
116 #include "components/browser_sync/common/browser_sync_switches.h" 118 #include "components/browser_sync/common/browser_sync_switches.h"
117 #include "components/device_event_log/device_event_log.h" 119 #include "components/device_event_log/device_event_log.h"
118 #include "components/metrics/metrics_service.h" 120 #include "components/metrics/metrics_service.h"
119 #include "components/ownership/owner_key_util.h" 121 #include "components/ownership/owner_key_util.h"
120 #include "components/session_manager/core/session_manager.h" 122 #include "components/session_manager/core/session_manager.h"
121 #include "components/signin/core/account_id/account_id.h" 123 #include "components/signin/core/account_id/account_id.h"
122 #include "components/user_manager/user.h" 124 #include "components/user_manager/user.h"
123 #include "components/user_manager/user_manager.h" 125 #include "components/user_manager/user_manager.h"
124 #include "components/wallpaper/wallpaper_manager_base.h" 126 #include "components/wallpaper/wallpaper_manager_base.h"
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 load_oem_statistics); 387 load_oem_statistics);
386 388
387 base::FilePath downloads_directory; 389 base::FilePath downloads_directory;
388 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); 390 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory));
389 391
390 DeviceOAuth2TokenServiceFactory::Initialize(); 392 DeviceOAuth2TokenServiceFactory::Initialize();
391 393
392 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); 394 wake_on_wifi_manager_.reset(new WakeOnWifiManager());
393 395
394 arc_service_manager_.reset(new arc::ArcServiceManager( 396 arc_service_manager_.reset(new arc::ArcServiceManager(
397 make_scoped_ptr(new arc::ArcAuthServiceImpl()),
395 make_scoped_ptr(new arc::ArcSettingsBridgeImpl()))); 398 make_scoped_ptr(new arc::ArcSettingsBridgeImpl())));
396 arc_service_manager_->arc_bridge_service()->DetectAvailability(); 399 arc_service_manager_->arc_bridge_service()->DetectAvailability();
397 400
398 chromeos::ResourceReporter::GetInstance()->StartMonitoring(); 401 chromeos::ResourceReporter::GetInstance()->StartMonitoring();
399 402
400 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); 403 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun();
401 } 404 }
402 405
403 void ChromeBrowserMainPartsChromeos::PreProfileInit() { 406 void ChromeBrowserMainPartsChromeos::PreProfileInit() {
404 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() 407 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 // Destroy DBus services immediately after threads are stopped. 826 // Destroy DBus services immediately after threads are stopped.
824 dbus_services_.reset(); 827 dbus_services_.reset();
825 828
826 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 829 ChromeBrowserMainPartsLinux::PostDestroyThreads();
827 830
828 // Destroy DeviceSettingsService after g_browser_process. 831 // Destroy DeviceSettingsService after g_browser_process.
829 DeviceSettingsService::Shutdown(); 832 DeviceSettingsService::Shutdown();
830 } 833 }
831 834
832 } // namespace chromeos 835 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698