Merge arc/common/settings.mojom into intent_helper.mojom

chrome/browser/chromeos/arc/settings_bridge.cc

Index: chrome/browser/chromeos/arc/settings_bridge.cc
diff --git a/chrome/browser/chromeos/arc/arc_settings_bridge_impl.cc b/chrome/browser/chromeos/arc/settings_bridge.cc
similarity index 61%
rename from chrome/browser/chromeos/arc/arc_settings_bridge_impl.cc
rename to chrome/browser/chromeos/arc/settings_bridge.cc
index 89c611baeb4f608325daefb3808611615772fc5e..ad1072b28f8dcf4bd776427124a34d07ba0caf27 100644
--- a/chrome/browser/chromeos/arc/arc_settings_bridge_impl.cc
+++ b/chrome/browser/chromeos/arc/settings_bridge.cc
@@ -2,16 +2,14 @@
 // 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/arc_settings_bridge_impl.h"
+#include "chrome/browser/chromeos/arc/settings_bridge.h"
 
 #include <algorithm>
 
-#include "base/json/json_writer.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
-#include "components/arc/common/settings.mojom.h"
 
 using ::chromeos::system::TimezoneSettings;
 
@@ -44,19 +42,17 @@ double ConvertFontSizeChromeToAndroid(int default_size,
 
 }  // namespace fontsizes
 
-ArcSettingsBridgeImpl::~ArcSettingsBridgeImpl() {
-  ArcBridgeService* bridge_service = ArcBridgeService::Get();
-  DCHECK(bridge_service);
-  bridge_service->RemoveObserver(this);
+SettingsBridge::SettingsBridge(SettingsBridge::Delegate* delegate)
+    : delegate_(delegate) {
+  StartObservingSettingsChanges();
+  SyncAllPrefs();
 }
 
-void ArcSettingsBridgeImpl::StartObservingBridgeServiceChanges() {
-  ArcBridgeService* bridge_service = ArcBridgeService::Get();
-  DCHECK(bridge_service);
-  bridge_service->AddObserver(this);
+SettingsBridge::~SettingsBridge() {
+  StopObservingSettingsChanges();
 }
 
-void ArcSettingsBridgeImpl::StartObservingSettingsChanges() {
+void SettingsBridge::StartObservingSettingsChanges() {
   Profile* profile = ProfileManager::GetActiveUserProfile();
   registrar_.Init(profile->GetPrefs());
 
@@ -68,25 +64,25 @@ void ArcSettingsBridgeImpl::StartObservingSettingsChanges() {
   TimezoneSettings::GetInstance()->AddObserver(this);
 }
 
-void ArcSettingsBridgeImpl::SyncAllPrefs() const {
+void SettingsBridge::SyncAllPrefs() const {
   SyncFontSize();
   SyncLocale();
   SyncSpokenFeedbackEnabled();
   SyncTimeZone();
 }
 
-void ArcSettingsBridgeImpl::StopObservingSettingsChanges() {
+void SettingsBridge::StopObservingSettingsChanges() {
   registrar_.RemoveAll();
 
   TimezoneSettings::GetInstance()->RemoveObserver(this);
 }
 
-void ArcSettingsBridgeImpl::AddPrefToObserve(const std::string& pref_name) {
-  registrar_.Add(pref_name, base::Bind(&ArcSettingsBridgeImpl::OnPrefChanged,
+void SettingsBridge::AddPrefToObserve(const std::string& pref_name) {
+  registrar_.Add(pref_name, base::Bind(&SettingsBridge::OnPrefChanged,
                                        base::Unretained(this)));
 }
 
-void ArcSettingsBridgeImpl::OnPrefChanged(const std::string& pref_name) const {
+void SettingsBridge::OnPrefChanged(const std::string& pref_name) const {
   if (pref_name == prefs::kAccessibilitySpokenFeedbackEnabled) {
     SyncSpokenFeedbackEnabled();
   } else if (pref_name == prefs::kWebKitDefaultFixedFontSize ||
@@ -98,24 +94,11 @@ void ArcSettingsBridgeImpl::OnPrefChanged(const std::string& pref_name) const {
   }
 }
 
-void ArcSettingsBridgeImpl::OnStateChanged(ArcBridgeService::State state) {
-  // ArcBridgeService::State::READY is emitted before ArcSettings app is ready
-  // to send broadcasts.  Instead we wait for the SettingsInstance to be ready.
-  if (state == ArcBridgeService::State::STOPPING) {
-    StopObservingSettingsChanges();
-  }
-}
-
-void ArcSettingsBridgeImpl::OnSettingsInstanceReady() {
-  StartObservingSettingsChanges();
-  SyncAllPrefs();
-}
-
-void ArcSettingsBridgeImpl::TimezoneChanged(const icu::TimeZone& timezone) {
+void SettingsBridge::TimezoneChanged(const icu::TimeZone& timezone) {
   SyncTimeZone();
 }
 
-int ArcSettingsBridgeImpl::GetIntegerPref(const std::string& pref_name) const {
+int SettingsBridge::GetIntegerPref(const std::string& pref_name) const {
   const PrefService::Preference* pref =
       registrar_.prefs()->FindPreference(pref_name);
   DCHECK(pref);
@@ -125,7 +108,7 @@ int ArcSettingsBridgeImpl::GetIntegerPref(const std::string& pref_name) const {
   return val;
 }
 
-void ArcSettingsBridgeImpl::SyncFontSize() const {
+void SettingsBridge::SyncFontSize() const {
   int default_size = GetIntegerPref(prefs::kWebKitDefaultFontSize);
   int default_fixed_size = GetIntegerPref(prefs::kWebKitDefaultFixedFontSize);
   int minimum_size = GetIntegerPref(prefs::kWebKitMinimumFontSize);
@@ -135,10 +118,11 @@ void ArcSettingsBridgeImpl::SyncFontSize() const {
 
   base::DictionaryValue extras;
   extras.SetDouble("scale", android_scale);
-  SendSettingsBroadcast("org.chromium.arc.settings.SET_FONT_SCALE", extras);
+  SendSettingsBroadcast("org.chromium.arc.intent_helper.SET_FONT_SCALE",
+                        extras);
 }
 
-void ArcSettingsBridgeImpl::SyncSpokenFeedbackEnabled() const {
+void SettingsBridge::SyncSpokenFeedbackEnabled() const {
   const PrefService::Preference* pref = registrar_.prefs()->FindPreference(
       prefs::kAccessibilitySpokenFeedbackEnabled);
   DCHECK(pref);
@@ -147,11 +131,11 @@ void ArcSettingsBridgeImpl::SyncSpokenFeedbackEnabled() const {
   DCHECK(value_exists);
   base::DictionaryValue extras;
   extras.SetBoolean("enabled", enabled);
-  SendSettingsBroadcast("org.chromium.arc.settings.SET_SPOKEN_FEEDBACK_ENABLED",
-                        extras);
+  SendSettingsBroadcast(
+      "org.chromium.arc.intent_helper.SET_SPOKEN_FEEDBACK_ENABLED", extras);
 }
 
-void ArcSettingsBridgeImpl::SyncLocale() const {
+void SettingsBridge::SyncLocale() const {
   const PrefService::Preference* pref =
       registrar_.prefs()->FindPreference(prefs::kApplicationLocale);
   DCHECK(pref);
@@ -160,33 +144,22 @@ void ArcSettingsBridgeImpl::SyncLocale() const {
   DCHECK(value_exists);
   base::DictionaryValue extras;
   extras.SetString("locale", locale);
-  SendSettingsBroadcast("org.chromium.arc.settings.SET_LOCALE", extras);
+  SendSettingsBroadcast("org.chromium.arc.intent_helper.SET_LOCALE", extras);
 }
 
-void ArcSettingsBridgeImpl::SyncTimeZone() const {
+void SettingsBridge::SyncTimeZone() const {
   TimezoneSettings* timezone_settings = TimezoneSettings::GetInstance();
   base::string16 timezoneID = timezone_settings->GetCurrentTimezoneID();
   base::DictionaryValue extras;
   extras.SetString("olsonTimeZone", timezoneID);
-  SendSettingsBroadcast("org.chromium.arc.settings.SET_TIME_ZONE", extras);
+  SendSettingsBroadcast("org.chromium.arc.intent_helper.SET_TIME_ZONE", extras);
 }
 
-void ArcSettingsBridgeImpl::SendSettingsBroadcast(
+void SettingsBridge::SendSettingsBroadcast(
     const std::string& action,
     const base::DictionaryValue& extras) const {
-  ArcBridgeService* bridge_service = ArcBridgeService::Get();
-  if (!bridge_service ||
-      bridge_service->state() != ArcBridgeService::State::READY) {
-    LOG(ERROR) << "Bridge service is not ready.";
-    return;
-  }
-
-  std::string extras_json;
-  bool write_success = base::JSONWriter::Write(extras, &extras_json);
-  DCHECK(write_success);
-  bridge_service->settings_instance()->SendBroadcast(
-      action, "org.chromium.arc.settings",
-      "org.chromium.arc.settings.SettingsReceiver", extras_json);
+  if (delegate_)

[benhansen1, 2016/01/21 02:41:05]

Should we DCHECK delegate instead since it should always be set?

[Yusuke Sato, 2016/01/21 22:42:57]

Done.

+    delegate_->OnBroadcastNeeded(action, extras);
 }
 
 }  // namespace arc