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

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 2704113003: Save Play user id when ARC user gets a Managed Google Play account (Closed)
Patch Set: Created 3 years, 10 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/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 61599a01a1b0eaa1e17ef8ac77d7f9347a6397e2..7a31b79dcf629a40d9c96170d85420274fa60f60 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -15,6 +15,7 @@
#include "chrome/browser/browser_process_impl.h"
#include "chrome/browser/browser_shutdown.h"
#include "chrome/browser/chrome_content_browser_client.h"
+#include "chrome/browser/chromeos/arc/auth/arc_active_directory_enrollment_token_fetcher.h"
Greg Levin 2017/02/21 17:35:47 This should be moved down to the "#if defined(OS_C
Marton Hunyady 2017/02/22 15:21:21 Done.
#include "chrome/browser/component_updater/component_updater_prefs.h"
#include "chrome/browser/custom_handlers/protocol_handler_registry.h"
#include "chrome/browser/devtools/devtools_window.h"
@@ -574,6 +575,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
#endif
#if defined(OS_CHROMEOS)
+ arc::ArcActiveDirectoryEnrollmentTokenFetcher::RegisterProfilePrefs(registry);
arc::ArcSessionManager::RegisterProfilePrefs(registry);
arc::ArcPolicyBridge::RegisterProfilePrefs(registry);
chromeos::first_run::RegisterProfilePrefs(registry);
« no previous file with comments | « chrome/browser/chromeos/profiles/profile_helper.h ('k') | components/policy/core/common/policy_pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698