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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.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: 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: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 23a96a32e1efe432fbc48c8c23f81615769b3b7c..c8136c08f9ea4edc9bf2c36186fafac839fc0508 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -35,6 +35,7 @@
#include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h"
#include "chrome/browser/chromeos/arc/arc_auth_service_impl.h"
#include "chrome/browser/chromeos/arc/arc_intent_helper_bridge_impl.h"
+#include "chrome/browser/chromeos/arc/arc_opt_in_manager_impl.h"
#include "chrome/browser/chromeos/arc/arc_settings_bridge_impl.h"
#include "chrome/browser/chromeos/boot_times_recorder.h"
#include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate.h"
@@ -400,6 +401,7 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
wake_on_wifi_manager_.reset(new WakeOnWifiManager());
arc_service_manager_.reset(new arc::ArcServiceManager(
+ make_scoped_ptr(new arc::ArcOptInManagerImpl()),
make_scoped_ptr(new arc::ArcAuthServiceImpl()),
make_scoped_ptr(new arc::ArcIntentHelperBridgeImpl()),
make_scoped_ptr(new arc::ArcSettingsBridgeImpl()),

Powered by Google App Engine
This is Rietveld 408576698