Commit 941d471c authored by Yue Li's avatar Yue Li Committed by Commit Bot

Check ShouldArcAlwaysStart flag for play store state

For testing purposes, check the ShouldArcAlwaysStart flag for the play
store state. The flag will only turned on by a command line flag for
testing purposes.

Background: https://chrome-internal-review.googlesource.com/c/chromeos/platform/tast-tests-private/+/1948653

Bug: 982538
Test: Run existing tests
Change-Id: I7c8c3c97df5b696b9fcc467e7abc7e980305f05a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1962598
Commit-Queue: Yue Li <updowndota@chromium.org>
Reviewed-by: default avatarYue Li <updowndota@chromium.org>
Reviewed-by: default avatarXiaohui Chen <xiaohuic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726228}
parent ef0b8d94
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chromeos/services/assistant/public/cpp/assistant_prefs.h" #include "chromeos/services/assistant/public/cpp/assistant_prefs.h"
#include "components/arc/arc_util.h"
#include "components/language/core/browser/pref_names.h" #include "components/language/core/browser/pref_names.h"
#include "components/prefs/pref_change_registrar.h" #include "components/prefs/pref_change_registrar.h"
#include "components/prefs/pref_service.h" #include "components/prefs/pref_service.h"
...@@ -54,7 +55,10 @@ void AssistantStateClient::ActiveUserChanged(user_manager::User* active_user) { ...@@ -54,7 +55,10 @@ void AssistantStateClient::ActiveUserChanged(user_manager::User* active_user) {
} }
void AssistantStateClient::OnArcPlayStoreEnabledChanged(bool enabled) { void AssistantStateClient::OnArcPlayStoreEnabledChanged(bool enabled) {
ash::AssistantState::Get()->NotifyArcPlayStoreEnabledChanged(enabled); // ARC Android instance will be enabled if user opt-in play store, or the ARC
// always start flag is set.
ash::AssistantState::Get()->NotifyArcPlayStoreEnabledChanged(
arc::ShouldArcAlwaysStart() || enabled);
} }
void AssistantStateClient::SetProfileByUser(const user_manager::User* user) { void AssistantStateClient::SetProfileByUser(const user_manager::User* user) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment