Extract kArcEnabled preference from ArcSessionManager part 1.

chrome/browser/chromeos/note_taking_helper.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/note_taking_helper.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "apps/launcher.h"
@@ skipping 203 matching lines @@
     whitelisted_chrome_app_ids_ = base::SplitString(
         switch_value, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
   }
   whitelisted_chrome_app_ids_.insert(whitelisted_chrome_app_ids_.end(),
                                      kExtensionIds,
                                      kExtensionIds + arraysize(kExtensionIds));
 
   // Track profiles so we can observe their extension registries.
   registrar_.Add(this, chrome::NOTIFICATION_PROFILE_ADDED,
                  content::NotificationService::AllBrowserContextsAndSources());
+  android_enabled_ = false;
   for (Profile* profile :
        g_browser_process->profile_manager()->GetLoadedProfiles()) {
     extension_registry_observer_.Add(
         extensions::ExtensionRegistry::Get(profile));
+    // Check if the profile has already enabled Google Play Store.
+    // IsArcPlayStoreEnabledForProfile() can return true only for the primary

[Yusuke Sato, 2017/02/17 22:27:09]

Hmm.. but the primary profile thing is not mentioned in arc_util.h. Can you
mention it in the header? (or, check if the profile is primary here maybe?)

[hidehiko, 2017/02/20 18:18:44]

Hmm, I thought the combination of "if ARC is not allowed" in the function
comment, and "if the Profile is not for the primary user" for the
IsArcAllowedForProfile() described it... Anyway, added explicit deps from
IsArcPlayStoreEnabledForProfile() to IsArcAllowedForProfile(). Does it work for
you?

[Yusuke Sato, 2017/02/21 20:59:43]

Yes, thanks.

+    // profile.
+    android_enabled_ |= arc::IsArcPlayStoreEnabledForProfile(profile);
   }
 
-  // Check if the primary profile has already enabled ARC and watch for changes.
+  // Watch for changes of Google Play Store enabled state.
   auto session_manager = arc::ArcSessionManager::Get();
   session_manager->AddObserver(this);
-  android_enabled_ = session_manager->IsArcPlayStoreEnabled();
 
   // ArcIntentHelperBridge will notify us about changes to the list of available
   // Android apps.
   auto intent_helper_bridge =
       arc::ArcServiceManager::GetGlobalService<arc::ArcIntentHelperBridge>();
   if (intent_helper_bridge)
     intent_helper_bridge->AddObserver(this);
 
   // If the ARC intent helper is ready, get the Android apps. Otherwise,
   // UpdateAndroidApps() will be called when ArcServiceManager calls
@@ skipping 170 matching lines @@
     for (auto& observer : observers_)
       observer.OnAvailableNoteTakingAppsUpdated();
   }
 }
 
 void NoteTakingHelper::OnShutdown(extensions::ExtensionRegistry* registry) {
   extension_registry_observer_.Remove(registry);
 }
 
 }  // namespace chromeos