diff options
| author | benhansen <benhansen@google.com> | 2015-12-18 11:26:33 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-18 19:28:21 +0000 |
| commit | 97f351d4cd4c16638fcaebc791d883dddb4fb848 (patch) | |
| tree | d0dbd09b5c8abd4a09d39ef78ceef7bc1a57f88b /chrome/browser/chromeos/chrome_browser_main_chromeos.cc | |
| parent | d5ced07756084491d67575fabf0e2a6c88266586 (diff) | |
| download | chromium_src-97f351d4cd4c16638fcaebc791d883dddb4fb848.zip chromium_src-97f351d4cd4c16638fcaebc791d883dddb4fb848.tar.gz chromium_src-97f351d4cd4c16638fcaebc791d883dddb4fb848.tar.bz2 | |
arc: Add settings bridge
Synchronize font and spoken feedback enabled settings from Chrome to
Android on Android start and keep settings in sync by listening for
Chrome preference changes.
Related changes:
* ag/822770
* ag/822726
BUG=561003
TEST=./unit_tests --gtest_filter='Arc*'
TEST=Build both sides. Change font size in chrome://settings or enable
spoken feedback (Ctrl+Alt+Z). Observe change in Android.
Review URL: https://codereview.chromium.org/1539633002
Cr-Commit-Position: refs/heads/master@{#366145}
Diffstat (limited to 'chrome/browser/chromeos/chrome_browser_main_chromeos.cc')
| -rw-r--r-- | chrome/browser/chromeos/chrome_browser_main_chromeos.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc index 3c83155..33f04e4 100644 --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc @@ -30,6 +30,7 @@ #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h" +#include "chrome/browser/chromeos/arc/arc_settings_bridge_impl.h" #include "chrome/browser/chromeos/boot_times_recorder.h" #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate.h" #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.h" @@ -111,6 +112,7 @@ #include "chromeos/tpm/tpm_token_loader.h" #include "components/arc/arc_bridge_service.h" #include "components/arc/arc_service_manager.h" +#include "components/arc/settings/arc_settings_bridge.h" #include "components/browser_sync/common/browser_sync_switches.h" #include "components/device_event_log/device_event_log.h" #include "components/metrics/metrics_service.h" @@ -389,7 +391,8 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() { wake_on_wifi_manager_.reset(new WakeOnWifiManager()); - arc_service_manager_.reset(new arc::ArcServiceManager()); + arc_service_manager_.reset(new arc::ArcServiceManager( + make_scoped_ptr(new arc::ArcSettingsBridgeImpl()))); arc_service_manager_->arc_bridge_service()->DetectAvailability(); chromeos::ResourceReporter::GetInstance()->StartMonitoring(); |