OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "components/arc/arc_service_manager.h" | 5 #include "components/arc/arc_service_manager.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/sequenced_task_runner.h" | 9 #include "base/sequenced_task_runner.h" |
10 #include "base/thread_task_runner_handle.h" | 10 #include "base/thread_task_runner_handle.h" |
11 #include "components/arc/arc_bridge_bootstrap.h" | 11 #include "components/arc/arc_bridge_bootstrap.h" |
12 #include "components/arc/arc_bridge_service_impl.h" | 12 #include "components/arc/arc_bridge_service_impl.h" |
13 #include "components/arc/auth/arc_auth_service.h" | 13 #include "components/arc/auth/arc_auth_service.h" |
14 #include "components/arc/clipboard/arc_clipboard_bridge.h" | 14 #include "components/arc/clipboard/arc_clipboard_bridge.h" |
15 #include "components/arc/ime/arc_ime_bridge.h" | 15 #include "components/arc/ime/arc_ime_bridge.h" |
16 #include "components/arc/input/arc_input_bridge.h" | 16 #include "components/arc/input/arc_input_bridge.h" |
17 #include "components/arc/intent_helper/arc_intent_helper_bridge.h" | 17 #include "components/arc/intent_helper/arc_intent_helper_bridge.h" |
18 #include "components/arc/opt_in/arc_opt_in_manager.h" | |
18 #include "components/arc/power/arc_power_bridge.h" | 19 #include "components/arc/power/arc_power_bridge.h" |
19 #include "components/arc/settings/arc_settings_bridge.h" | 20 #include "components/arc/settings/arc_settings_bridge.h" |
20 #include "components/arc/video/arc_video_bridge.h" | 21 #include "components/arc/video/arc_video_bridge.h" |
21 #include "ui/arc/notification/arc_notification_manager.h" | 22 #include "ui/arc/notification/arc_notification_manager.h" |
22 | 23 |
23 namespace arc { | 24 namespace arc { |
24 | 25 |
25 namespace { | 26 namespace { |
26 | 27 |
27 // Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos. | 28 // Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos. |
28 ArcServiceManager* g_arc_service_manager = nullptr; | 29 ArcServiceManager* g_arc_service_manager = nullptr; |
29 | 30 |
30 } // namespace | 31 } // namespace |
31 | 32 |
32 ArcServiceManager::ArcServiceManager( | 33 ArcServiceManager::ArcServiceManager( |
34 scoped_ptr<ArcOptInManager> opt_in_manager, | |
33 scoped_ptr<ArcAuthService> auth_service, | 35 scoped_ptr<ArcAuthService> auth_service, |
34 scoped_ptr<ArcIntentHelperBridge> intent_helper_bridge, | 36 scoped_ptr<ArcIntentHelperBridge> intent_helper_bridge, |
35 scoped_ptr<ArcSettingsBridge> settings_bridge, | 37 scoped_ptr<ArcSettingsBridge> settings_bridge, |
36 scoped_ptr<ArcVideoBridge> video_bridge) | 38 scoped_ptr<ArcVideoBridge> video_bridge) |
37 : arc_bridge_service_( | 39 : arc_bridge_service_( |
38 new ArcBridgeServiceImpl(ArcBridgeBootstrap::Create())), | 40 new ArcBridgeServiceImpl(ArcBridgeBootstrap::Create())), |
41 arc_opt_in_manager_(std::move(opt_in_manager)), | |
39 arc_auth_service_(std::move(auth_service)), | 42 arc_auth_service_(std::move(auth_service)), |
40 arc_clipboard_bridge_(new ArcClipboardBridge(arc_bridge_service_.get())), | 43 arc_clipboard_bridge_(new ArcClipboardBridge(arc_bridge_service_.get())), |
41 arc_ime_bridge_(new ArcImeBridge(arc_bridge_service_.get())), | 44 arc_ime_bridge_(new ArcImeBridge(arc_bridge_service_.get())), |
42 arc_input_bridge_(ArcInputBridge::Create(arc_bridge_service_.get())), | 45 arc_input_bridge_(ArcInputBridge::Create(arc_bridge_service_.get())), |
43 arc_intent_helper_bridge_(std::move(intent_helper_bridge)), | 46 arc_intent_helper_bridge_(std::move(intent_helper_bridge)), |
44 arc_settings_bridge_(std::move(settings_bridge)), | 47 arc_settings_bridge_(std::move(settings_bridge)), |
45 arc_power_bridge_(new ArcPowerBridge(arc_bridge_service_.get())), | 48 arc_power_bridge_(new ArcPowerBridge(arc_bridge_service_.get())), |
46 arc_video_bridge_(std::move(video_bridge)) { | 49 arc_video_bridge_(std::move(video_bridge)) { |
47 DCHECK(!g_arc_service_manager); | 50 DCHECK(!g_arc_service_manager); |
48 g_arc_service_manager = this; | 51 g_arc_service_manager = this; |
(...skipping 15 matching lines...) Expand all Loading... | |
64 DCHECK(g_arc_service_manager); | 67 DCHECK(g_arc_service_manager); |
65 DCHECK(g_arc_service_manager->thread_checker_.CalledOnValidThread()); | 68 DCHECK(g_arc_service_manager->thread_checker_.CalledOnValidThread()); |
66 return g_arc_service_manager; | 69 return g_arc_service_manager; |
67 } | 70 } |
68 | 71 |
69 ArcBridgeService* ArcServiceManager::arc_bridge_service() { | 72 ArcBridgeService* ArcServiceManager::arc_bridge_service() { |
70 DCHECK(thread_checker_.CalledOnValidThread()); | 73 DCHECK(thread_checker_.CalledOnValidThread()); |
71 return arc_bridge_service_.get(); | 74 return arc_bridge_service_.get(); |
72 } | 75 } |
73 | 76 |
74 void ArcServiceManager::OnPrimaryUserProfilePrepared( | 77 void ArcServiceManager::SetProfileAndAccountId(Profile* profile, |
75 const AccountId& account_id) { | 78 const AccountId& account_id) { |
76 DCHECK(thread_checker_.CalledOnValidThread()); | 79 DCHECK(thread_checker_.CalledOnValidThread()); |
77 | 80 |
81 arc_opt_in_manager_->SetProfile(profile); | |
lhc(google)
2016/01/22 22:18:33
Is it possible to construct the ArcOptInManager wi
khmel
2016/01/23 00:41:43
I answered in previous comment.
| |
78 arc_notification_manager_.reset( | 82 arc_notification_manager_.reset( |
79 new ArcNotificationManager(arc_bridge_service(), account_id)); | 83 new ArcNotificationManager(arc_bridge_service(), account_id)); |
80 } | 84 } |
81 | 85 |
82 } // namespace arc | 86 } // namespace arc |
OLD | NEW |