Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3109)

Unified Diff: chrome/browser/chromeos/arc/arc_settings_service.cc

Issue 2133503002: arc: Revamp the ArcBridgeService interface (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: More rebasing Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/arc/arc_settings_service.cc
diff --git a/chrome/browser/chromeos/arc/arc_settings_service.cc b/chrome/browser/chromeos/arc/arc_settings_service.cc
index 3c6afe3798200de770eeb54fb3a4a5d9c83f1b5a..74dd19cc5bf713b9ceb36466204fff70ca1cbaa7 100644
--- a/chrome/browser/chromeos/arc/arc_settings_service.cc
+++ b/chrome/browser/chromeos/arc/arc_settings_service.cc
@@ -365,7 +365,7 @@ void ArcSettingsServiceImpl::SyncProxySettings() const {
void ArcSettingsServiceImpl::SendSettingsBroadcast(
const std::string& action,
const base::DictionaryValue& extras) const {
- if (!arc_bridge_service_->intent_helper_instance()) {
+ if (!arc_bridge_service_->intent_helper()->instance()) {
LOG(ERROR) << "IntentHelper instance is not ready.";
return;
}
@@ -374,8 +374,8 @@ void ArcSettingsServiceImpl::SendSettingsBroadcast(
bool write_success = base::JSONWriter::Write(extras, &extras_json);
DCHECK(write_success);
- if (arc_bridge_service_->intent_helper_version() >= 1) {
- arc_bridge_service_->intent_helper_instance()->SendBroadcast(
+ if (arc_bridge_service_->intent_helper()->version() >= 1) {
+ arc_bridge_service_->intent_helper()->instance()->SendBroadcast(
action, "org.chromium.arc.intent_helper",
"org.chromium.arc.intent_helper.SettingsReceiver", extras_json);
}
@@ -383,18 +383,18 @@ void ArcSettingsServiceImpl::SendSettingsBroadcast(
ArcSettingsService::ArcSettingsService(ArcBridgeService* bridge_service)
: ArcService(bridge_service) {
- arc_bridge_service()->AddObserver(this);
+ arc_bridge_service()->intent_helper()->AddObserver(this);
}
ArcSettingsService::~ArcSettingsService() {
- arc_bridge_service()->RemoveObserver(this);
+ arc_bridge_service()->intent_helper()->RemoveObserver(this);
}
-void ArcSettingsService::OnIntentHelperInstanceReady() {
+void ArcSettingsService::OnInstanceReady() {
impl_.reset(new ArcSettingsServiceImpl(arc_bridge_service()));
}
-void ArcSettingsService::OnIntentHelperInstanceClosed() {
+void ArcSettingsService::OnInstanceClosed() {
impl_.reset();
}
« no previous file with comments | « chrome/browser/chromeos/arc/arc_settings_service.h ('k') | chrome/browser/chromeos/arc/gpu_arc_video_service_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698