Start ARC and sign in after Chrome OS login

chrome/browser/chromeos/note_taking_helper.cc

Index: chrome/browser/chromeos/note_taking_helper.cc
diff --git a/chrome/browser/chromeos/note_taking_helper.cc b/chrome/browser/chromeos/note_taking_helper.cc
index 4b7fdf1925dfe56d653d3df3cdcda022bf02445e..45ca9358beb6440eb1ddf556e2e72b6d15ecf55d 100644
--- a/chrome/browser/chromeos/note_taking_helper.cc
+++ b/chrome/browser/chromeos/note_taking_helper.cc
@@ -186,12 +186,12 @@ void NoteTakingHelper::LaunchAppForNewNote(Profile* profile,
 }
 
 void NoteTakingHelper::OnIntentFiltersUpdated() {
-  if (android_enabled_)
+  if (play_store_enabled_)
     UpdateAndroidApps();
 }
 
 void NoteTakingHelper::OnArcPlayStoreEnabledChanged(bool enabled) {
-  android_enabled_ = enabled;
+  play_store_enabled_ = enabled;
   if (!enabled) {
     android_apps_.clear();
     android_apps_received_ = false;
@@ -221,7 +221,7 @@ NoteTakingHelper::NoteTakingHelper()
   // Track profiles so we can observe their extension registries.
   registrar_.Add(this, chrome::NOTIFICATION_PROFILE_ADDED,
                  content::NotificationService::AllBrowserContextsAndSources());
-  android_enabled_ = false;
+  play_store_enabled_ = false;
   for (Profile* profile :
        g_browser_process->profile_manager()->GetLoadedProfiles()) {
     extension_registry_observer_.Add(
@@ -229,7 +229,7 @@ NoteTakingHelper::NoteTakingHelper()
     // Check if the profile has already enabled Google Play Store.
     // IsArcPlayStoreEnabledForProfile() can return true only for the primary
     // profile.
-    android_enabled_ |= arc::IsArcPlayStoreEnabledForProfile(profile);
+    play_store_enabled_ |= arc::IsArcPlayStoreEnabledForProfile(profile);
   }
 
   // Watch for changes of Google Play Store enabled state.
@@ -246,11 +246,10 @@ NoteTakingHelper::NoteTakingHelper()
   // If the ARC intent helper is ready, get the Android apps. Otherwise,
   // UpdateAndroidApps() will be called when ArcServiceManager calls
   // OnIntentFiltersUpdated().
-  if (android_enabled_ &&
-      arc::ArcServiceManager::Get()
-          ->arc_bridge_service()
-          ->intent_helper()
-          ->has_instance())
+  if (play_store_enabled_ && arc::ArcServiceManager::Get()
+                                 ->arc_bridge_service()
+                                 ->intent_helper()
+                                 ->has_instance())
     UpdateAndroidApps();

[stevenjb, 2017/03/03 18:25:34]

{}

[victorhsieh, 2017/03/03 18:51:50]

Done.

 }
 
@@ -318,7 +317,7 @@ void NoteTakingHelper::UpdateAndroidApps() {
 void NoteTakingHelper::OnGotAndroidApps(
     std::vector<arc::mojom::IntentHandlerInfoPtr> handlers) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  if (!android_enabled_)
+  if (!play_store_enabled_)
     return;
 
   android_apps_.clear();