Support focus highlight in Android window

chrome/browser/chromeos/arc/intent_helper/arc_settings_service.cc

Index: chrome/browser/chromeos/arc/intent_helper/arc_settings_service.cc
diff --git a/chrome/browser/chromeos/arc/intent_helper/arc_settings_service.cc b/chrome/browser/chromeos/arc/intent_helper/arc_settings_service.cc
index 552675f6388e5544bad9b091392a1489598deee5..c4aad82e60e232bc59b62c976bd7895430be812a 100644
--- a/chrome/browser/chromeos/arc/intent_helper/arc_settings_service.cc
+++ b/chrome/browser/chromeos/arc/intent_helper/arc_settings_service.cc
@@ -118,6 +118,7 @@ class ArcSettingsServiceImpl
   // Send settings that need to be synced only on Android first start to
   // Android.
   void SyncInitialSettings() const;
+  void SyncFocusHighlightEnabled() const;
   void SyncFontSize() const;
   void SyncLocale() const;
   void SyncProxySettings() const;
@@ -185,16 +186,18 @@ void ArcSettingsServiceImpl::StartObservingSettingsChanges() {
   Profile* profile = ProfileManager::GetActiveUserProfile();
   registrar_.Init(profile->GetPrefs());
 
+  // Keep these lines ordered lexicographically.
+  AddPrefToObserve(prefs::kAccessibilityFocusHighlightEnabled);
+  AddPrefToObserve(prefs::kAccessibilitySpokenFeedbackEnabled);
+  AddPrefToObserve(prefs::kAccessibilityVirtualKeyboardEnabled);
+  AddPrefToObserve(prefs::kArcBackupRestoreEnabled);
+  AddPrefToObserve(prefs::kUse24HourClock);
   AddPrefToObserve(prefs::kWebKitDefaultFixedFontSize);
   AddPrefToObserve(prefs::kWebKitDefaultFontSize);
   AddPrefToObserve(prefs::kWebKitMinimumFontSize);
-  AddPrefToObserve(prefs::kAccessibilitySpokenFeedbackEnabled);
-  AddPrefToObserve(prefs::kUse24HourClock);
-  AddPrefToObserve(prefs::kArcBackupRestoreEnabled);
   AddPrefToObserve(proxy_config::prefs::kProxy);
   AddPrefToObserve(onc::prefs::kDeviceOpenNetworkConfiguration);
   AddPrefToObserve(onc::prefs::kOpenNetworkConfiguration);
-  AddPrefToObserve(prefs::kAccessibilityVirtualKeyboardEnabled);
 
   reporting_consent_subscription_ = CrosSettings::Get()->AddSettingsObserver(
       chromeos::kStatsReportingPref,
@@ -227,6 +230,9 @@ void ArcSettingsServiceImpl::OnArcInitialStart() {
 }
 
 void ArcSettingsServiceImpl::SyncRuntimeSettings() const {
+  // Keep these lines ordered lexicographically.
+  SyncAccessibilityVirtualKeyboardEnabled();
+  SyncFocusHighlightEnabled();
   SyncFontSize();
   SyncLocale();
   SyncProxySettings();
@@ -234,7 +240,6 @@ void ArcSettingsServiceImpl::SyncRuntimeSettings() const {
   SyncSpokenFeedbackEnabled();
   SyncTimeZone();
   SyncUse24HourClock();
-  SyncAccessibilityVirtualKeyboardEnabled();
 
   const PrefService* const prefs =
       ProfileManager::GetActiveUserProfile()->GetPrefs();
@@ -273,7 +278,9 @@ void ArcSettingsServiceImpl::AdapterPoweredChanged(
 }
 
 void ArcSettingsServiceImpl::OnPrefChanged(const std::string& pref_name) const {
-  if (pref_name == prefs::kAccessibilitySpokenFeedbackEnabled) {
+  if (pref_name == prefs::kAccessibilityFocusHighlightEnabled) {
+    SyncFocusHighlightEnabled();
+  } else if (pref_name == prefs::kAccessibilitySpokenFeedbackEnabled) {
     SyncSpokenFeedbackEnabled();
   } else if (pref_name == prefs::kWebKitDefaultFixedFontSize ||
              pref_name == prefs::kWebKitDefaultFontSize ||
@@ -342,6 +349,12 @@ void ArcSettingsServiceImpl::SendBoolPrefSettingsBroadcast(
   SendSettingsBroadcast(action, extras);
 }
 
+void ArcSettingsServiceImpl::SyncFocusHighlightEnabled() const {
+  SendBoolPrefSettingsBroadcast(
+      prefs::kAccessibilityFocusHighlightEnabled,
+      "org.chromium.arc.intent_helper.SET_FOCUS_HIGHLIGHT_ENABLED");
+}
+
 void ArcSettingsServiceImpl::SyncSpokenFeedbackEnabled() const {
   SendBoolPrefSettingsBroadcast(
       prefs::kAccessibilitySpokenFeedbackEnabled,