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

Unified Diff: components/arc/arc_service_manager.cc

Issue 1618193003: arc: Pass auth token from Chrome to ARC instance. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: minor formating 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 side-by-side diff with in-line comments
Download patch
Index: components/arc/arc_service_manager.cc
diff --git a/components/arc/arc_service_manager.cc b/components/arc/arc_service_manager.cc
index f6eace9d38a690b3bac965b2e849e799a109246c..20eb6deea82bfe8e217ee3d5f3382a28305eaf0b 100644
--- a/components/arc/arc_service_manager.cc
+++ b/components/arc/arc_service_manager.cc
@@ -15,6 +15,7 @@
#include "components/arc/ime/arc_ime_bridge.h"
#include "components/arc/input/arc_input_bridge.h"
#include "components/arc/intent_helper/arc_intent_helper_bridge.h"
+#include "components/arc/opt_in/arc_opt_in_manager.h"
#include "components/arc/power/arc_power_bridge.h"
#include "components/arc/settings/arc_settings_bridge.h"
#include "components/arc/video/arc_video_bridge.h"
@@ -30,12 +31,14 @@ ArcServiceManager* g_arc_service_manager = nullptr;
} // namespace
ArcServiceManager::ArcServiceManager(
+ scoped_ptr<ArcOptInManager> opt_in_manager,
scoped_ptr<ArcAuthService> auth_service,
scoped_ptr<ArcIntentHelperBridge> intent_helper_bridge,
scoped_ptr<ArcSettingsBridge> settings_bridge,
scoped_ptr<ArcVideoBridge> video_bridge)
: arc_bridge_service_(
new ArcBridgeServiceImpl(ArcBridgeBootstrap::Create())),
+ arc_opt_in_manager_(std::move(opt_in_manager)),
arc_auth_service_(std::move(auth_service)),
arc_clipboard_bridge_(new ArcClipboardBridge(arc_bridge_service_.get())),
arc_ime_bridge_(new ArcImeBridge(arc_bridge_service_.get())),
@@ -71,10 +74,11 @@ ArcBridgeService* ArcServiceManager::arc_bridge_service() {
return arc_bridge_service_.get();
}
-void ArcServiceManager::OnPrimaryUserProfilePrepared(
- const AccountId& account_id) {
+void ArcServiceManager::SetProfileAndAccountId(Profile* profile,
+ const AccountId& account_id) {
DCHECK(thread_checker_.CalledOnValidThread());
+ 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.
arc_notification_manager_.reset(
new ArcNotificationManager(arc_bridge_service(), account_id));
}

Powered by Google App Engine
This is Rietveld 408576698