Expand Chrome OS ARC support to create one tree source per package

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

 // Copyright 2015 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/arc/intent_helper/arc_settings_service.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/gtest_prod_util.h"
@@ skipping 480 matching lines @@
 void ArcSettingsServiceImpl::SyncReportingConsent() const {
   bool consent = false;
   CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref, &consent);
   base::DictionaryValue extras;
   extras.SetBoolean("reportingConsent", consent);
   SendSettingsBroadcast("org.chromium.arc.intent_helper.SET_REPORTING_CONSENT",
                         extras);
 }
 
 void ArcSettingsServiceImpl::SyncSpokenFeedbackEnabled() const {
-  // Chrome spoken feedback triggers enabling of Android spoken feedback.
-  // There are two types of spoken feedback from Android:
-  // 1. Talkback (default)
-  // 2. accessibility helper (experimental, works through ChromeVox).
-  // These two features are mutually exclusive.
-
-  const PrefService::Preference* pref = registrar_.prefs()->FindPreference(
-      prefs::kAccessibilitySpokenFeedbackEnabled);
-  DCHECK(pref);
-  bool enabled = false;
-  bool value_exists = pref->GetValue()->GetAsBoolean(&enabled);
-  CHECK(value_exists);
-  bool managed =
-      IsBooleanPrefManaged(prefs::kAccessibilitySpokenFeedbackEnabled);
-
-  std::string talkback_setting =
-      "org.chromium.arc.intent_helper.SET_SPOKEN_FEEDBACK_ENABLED";
-  std::string accessibility_helper_setting =
-      "org.chromium.arc.intent_helper.SET_ACCESSIBILITY_HELPER_ENABLED";
-
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          chromeos::switches::kEnableChromeVoxArcSupport)) {
-    // Make sure if ChromeVox is on, TalkBack is off.
-    if (enabled)
-      SendBoolValueSettingsBroadcast(false, managed, talkback_setting);
-
-    SendBoolValueSettingsBroadcast(enabled, managed,
-                                   accessibility_helper_setting);
-
-    return;
-  }
-
-  SendBoolValueSettingsBroadcast(enabled, managed, talkback_setting);
+  SendBoolPrefSettingsBroadcast(
+      prefs::kAccessibilitySpokenFeedbackEnabled,
+      "org.chromium.arc.intent_helper.SET_SPOKEN_FEEDBACK_ENABLED");
 }
 
 void ArcSettingsServiceImpl::SyncTimeZone() const {
   TimezoneSettings* timezone_settings = TimezoneSettings::GetInstance();
   base::string16 timezoneID = timezone_settings->GetCurrentTimezoneID();
   base::DictionaryValue extras;
   extras.SetString("olsonTimeZone", timezoneID);
   SendSettingsBroadcast("org.chromium.arc.intent_helper.SET_TIME_ZONE", extras);
 }
 
@@ skipping 106 matching lines @@
 
 void ArcSettingsService::OnInstanceReady() {
   impl_.reset(new ArcSettingsServiceImpl(arc_bridge_service()));
 }
 
 void ArcSettingsService::OnInstanceClosed() {
   impl_.reset();
 }
 
 }  // namespace arc