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

Unified Diff: chrome/browser/chromeos/note_taking_helper.cc

Issue 2707133006: Start ARC and sign in after Chrome OS login (Closed)
Patch Set: test coverage in chrome_launcher_controller_impl_unittest.cc 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/chromeos/note_taking_helper.cc
diff --git a/chrome/browser/chromeos/note_taking_helper.cc b/chrome/browser/chromeos/note_taking_helper.cc
index ef5a08ff8fa02c68db3622fff9bd578405302fb5..c56ff995335ee2ffef68523d93679ee093cde6f7 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;
@@ -230,7 +230,7 @@ NoteTakingHelper::NoteTakingHelper()
// Check if the primary profile has already enabled ARC and watch for changes.
auto session_manager = arc::ArcSessionManager::Get();
session_manager->AddObserver(this);
- android_enabled_ = session_manager->IsArcPlayStoreEnabled();
+ play_store_enabled_ = session_manager->IsArcPlayStoreEnabled();
// ArcIntentHelperBridge will notify us about changes to the list of available
// Android apps.
@@ -242,7 +242,7 @@ 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_ &&
+ if (play_store_enabled_ &&
arc::ArcServiceManager::Get()
->arc_bridge_service()
->intent_helper()
@@ -314,7 +314,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();

Powered by Google App Engine
This is Rietveld 408576698