diff options
Diffstat (limited to 'chromeos')
-rw-r--r-- | chromeos/chromeos.gyp | 4 | ||||
-rw-r--r-- | chromeos/dbus/arc_bridge_client.cc | 77 | ||||
-rw-r--r-- | chromeos/dbus/arc_bridge_client.h | 41 | ||||
-rw-r--r-- | chromeos/dbus/dbus_client_bundle.cc | 8 | ||||
-rw-r--r-- | chromeos/dbus/dbus_client_bundle.h | 5 | ||||
-rw-r--r-- | chromeos/dbus/dbus_thread_manager.cc | 11 | ||||
-rw-r--r-- | chromeos/dbus/dbus_thread_manager.h | 3 | ||||
-rw-r--r-- | chromeos/dbus/fake_arc_bridge_client.cc | 36 | ||||
-rw-r--r-- | chromeos/dbus/fake_arc_bridge_client.h | 33 |
9 files changed, 0 insertions, 218 deletions
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp index cf422a2..9372291 100644 --- a/chromeos/chromeos.gyp +++ b/chromeos/chromeos.gyp @@ -53,8 +53,6 @@ 'dbus/amplifier_client.h', 'dbus/ap_manager_client.cc', 'dbus/ap_manager_client.h', - 'dbus/arc_bridge_client.cc', - 'dbus/arc_bridge_client.h', 'dbus/audio_dsp_client.cc', 'dbus/audio_dsp_client.h', 'dbus/audio_node.cc', @@ -82,8 +80,6 @@ 'dbus/fake_amplifier_client.h', 'dbus/fake_ap_manager_client.cc', 'dbus/fake_ap_manager_client.h', - 'dbus/fake_arc_bridge_client.cc', - 'dbus/fake_arc_bridge_client.h', 'dbus/fake_audio_dsp_client.cc', 'dbus/fake_audio_dsp_client.h', 'dbus/fake_cras_audio_client.cc', diff --git a/chromeos/dbus/arc_bridge_client.cc b/chromeos/dbus/arc_bridge_client.cc deleted file mode 100644 index 584e10b..0000000 --- a/chromeos/dbus/arc_bridge_client.cc +++ /dev/null @@ -1,77 +0,0 @@ -// Copyright (c) 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 "chromeos/dbus/arc_bridge_client.h" - -#include "base/bind.h" -#include "base/logging.h" -#include "base/memory/weak_ptr.h" -#include "dbus/bus.h" -#include "dbus/message.h" -#include "dbus/object_path.h" -#include "dbus/object_proxy.h" - -namespace chromeos { - -namespace { - -// todo(denniskempin): Move constants to the chromiumos platform -// service_constants.h -const char kArcBridgeServicePath[] = "/org/chromium/arc"; -const char kArcBridgeServiceName[] = "org.chromium.arc"; -const char kArcBridgeServiceInterface[] = "org.chromium.arc"; - -const char kPingMethod[] = "Ping"; - -void OnVoidDBusMethod(const VoidDBusMethodCallback& callback, - dbus::Response* response) { - callback.Run(response ? DBUS_METHOD_CALL_SUCCESS : DBUS_METHOD_CALL_FAILURE); -} - -class ArcBridgeClientImpl : public ArcBridgeClient { - public: - ArcBridgeClientImpl() : proxy_(nullptr), weak_ptr_factory_(this) {} - - ~ArcBridgeClientImpl() override {} - - // Calls Ping method. |callback| is called after the method call succeeds. - void Ping(const VoidDBusMethodCallback& callback) override { - DCHECK(proxy_); - - dbus::MethodCall method_call(kArcBridgeServiceInterface, kPingMethod); - proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, - base::Bind(&OnVoidDBusMethod, callback)); - } - - protected: - void Init(dbus::Bus* bus) override { - proxy_ = bus->GetObjectProxy(kArcBridgeServiceName, - dbus::ObjectPath(kArcBridgeServicePath)); - DCHECK(proxy_); - } - - private: - dbus::ObjectProxy* proxy_; - - // Note: This should remain the last member so it'll be destroyed and - // invalidate its weak pointers before any other members are destroyed. - base::WeakPtrFactory<ArcBridgeClientImpl> weak_ptr_factory_; - - DISALLOW_COPY_AND_ASSIGN(ArcBridgeClientImpl); -}; - -} // namespace - -//////////////////////////////////////////////////////////////////////////////// -// ArcBridgeClient - -ArcBridgeClient::ArcBridgeClient() {} - -ArcBridgeClient::~ArcBridgeClient() {} - -// static -ArcBridgeClient* ArcBridgeClient::Create() { - return new ArcBridgeClientImpl(); -} - -} // namespace chromeos diff --git a/chromeos/dbus/arc_bridge_client.h b/chromeos/dbus/arc_bridge_client.h deleted file mode 100644 index 11d568d..0000000 --- a/chromeos/dbus/arc_bridge_client.h +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) 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. - -#ifndef CHROMEOS_ARC_BRIDGE_CLIENT_H_ -#define CHROMEOS_ARC_BRIDGE_CLIENT_H_ - -#include "base/basictypes.h" -#include "chromeos/chromeos_export.h" -#include "chromeos/dbus/dbus_client.h" -#include "chromeos/dbus/dbus_method_call_status.h" - -namespace dbus { -class ObjectPath; -} - -namespace chromeos { - -// Client for the Arc Bridge Service -class CHROMEOS_EXPORT ArcBridgeClient : public DBusClient { - public: - ~ArcBridgeClient() override; - - // Factory function, creates a new instance and returns ownership. - // For normal usage, access the singleton via DBusThreadManager::Get(). - static ArcBridgeClient* Create(); - - // Calls Ping method. |callback| is called after the method call succeeds. - virtual void Ping(const VoidDBusMethodCallback& callback) = 0; - - protected: - // Create() should be used instead. - ArcBridgeClient(); - - private: - DISALLOW_COPY_AND_ASSIGN(ArcBridgeClient); -}; - -} // namespace chromeos - -#endif // CHROMEOS_ARC_BRIDGE_CLIENT_H_ diff --git a/chromeos/dbus/dbus_client_bundle.cc b/chromeos/dbus/dbus_client_bundle.cc index 0397ff6..87e6598 100644 --- a/chromeos/dbus/dbus_client_bundle.cc +++ b/chromeos/dbus/dbus_client_bundle.cc @@ -12,7 +12,6 @@ #include "chromeos/chromeos_switches.h" #include "chromeos/dbus/amplifier_client.h" #include "chromeos/dbus/ap_manager_client.h" -#include "chromeos/dbus/arc_bridge_client.h" #include "chromeos/dbus/audio_dsp_client.h" #include "chromeos/dbus/cras_audio_client.h" #include "chromeos/dbus/cros_disks_client.h" @@ -21,7 +20,6 @@ #include "chromeos/dbus/easy_unlock_client.h" #include "chromeos/dbus/fake_amplifier_client.h" #include "chromeos/dbus/fake_ap_manager_client.h" -#include "chromeos/dbus/fake_arc_bridge_client.h" #include "chromeos/dbus/fake_audio_dsp_client.h" #include "chromeos/dbus/fake_cras_audio_client.h" #include "chromeos/dbus/fake_cryptohome_client.h" @@ -85,7 +83,6 @@ const struct { } client_type_map[] = { { "amplifier", DBusClientBundle::AMPLIFIER }, { "ap", DBusClientBundle::AP_MANAGER }, - { "arc", DBusClientBundle::ARC_BRIDGE }, { "audio_dsp", DBusClientBundle::AUDIO_DSP }, { "bluetooth", DBusClientBundle::BLUETOOTH }, { "cras", DBusClientBundle::CRAS }, @@ -131,11 +128,6 @@ DBusClientBundle::DBusClientBundle(DBusClientTypeMask unstub_client_mask) else amplifier_client_.reset(new FakeAmplifierClient); - if (!IsUsingStub(ARC_BRIDGE)) - arc_bridge_client_.reset(ArcBridgeClient::Create()); - else - arc_bridge_client_.reset(new FakeArcBridgeClient); - if (!IsUsingStub(AUDIO_DSP)) audio_dsp_client_.reset(AudioDspClient::Create()); else diff --git a/chromeos/dbus/dbus_client_bundle.h b/chromeos/dbus/dbus_client_bundle.h index 2fd9e58..ea39ad9 100644 --- a/chromeos/dbus/dbus_client_bundle.h +++ b/chromeos/dbus/dbus_client_bundle.h @@ -14,7 +14,6 @@ namespace chromeos { class AmplifierClient; class ApManagerClient; -class ArcBridgeClient; class AudioDspClient; class CrasAudioClient; class CrosDisksClient; @@ -81,7 +80,6 @@ class CHROMEOS_EXPORT DBusClientBundle { PRIVET_DAEMON = 1 << 21, AMPLIFIER = 1 << 22, AUDIO_DSP = 1 << 23, - ARC_BRIDGE = 1 << 24, }; explicit DBusClientBundle(DBusClientTypeMask unstub_client_mask); @@ -104,8 +102,6 @@ class CHROMEOS_EXPORT DBusClientBundle { ApManagerClient* ap_manager_client() { return ap_manager_client_.get(); } - ArcBridgeClient* arc_bridge_client() { return arc_bridge_client_.get(); } - AudioDspClient* audio_dsp_client() { return audio_dsp_client_.get(); } CrasAudioClient* cras_audio_client() { @@ -233,7 +229,6 @@ class CHROMEOS_EXPORT DBusClientBundle { scoped_ptr<AmplifierClient> amplifier_client_; scoped_ptr<ApManagerClient> ap_manager_client_; - scoped_ptr<ArcBridgeClient> arc_bridge_client_; scoped_ptr<AudioDspClient> audio_dsp_client_; scoped_ptr<CrasAudioClient> cras_audio_client_; scoped_ptr<CrosDisksClient> cros_disks_client_; diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc index ab8db4f..fe59021 100644 --- a/chromeos/dbus/dbus_thread_manager.cc +++ b/chromeos/dbus/dbus_thread_manager.cc @@ -10,7 +10,6 @@ #include "chromeos/chromeos_switches.h" #include "chromeos/dbus/amplifier_client.h" #include "chromeos/dbus/ap_manager_client.h" -#include "chromeos/dbus/arc_bridge_client.h" #include "chromeos/dbus/audio_dsp_client.h" #include "chromeos/dbus/cras_audio_client.h" #include "chromeos/dbus/cros_disks_client.h" @@ -108,10 +107,6 @@ AmplifierClient* DBusThreadManager::GetAmplifierClient() { return client_bundle_->amplifier_client(); } -ArcBridgeClient* DBusThreadManager::GetArcBridgeClient() { - return client_bundle_->arc_bridge_client(); -} - ApManagerClient* DBusThreadManager::GetApManagerClient() { return client_bundle_->ap_manager_client(); } @@ -246,7 +241,6 @@ UpdateEngineClient* DBusThreadManager::GetUpdateEngineClient() { void DBusThreadManager::InitializeClients() { GetAmplifierClient()->Init(GetSystemBus()); GetApManagerClient()->Init(GetSystemBus()); - GetArcBridgeClient()->Init(GetSystemBus()); GetAudioDspClient()->Init(GetSystemBus()); GetCrasAudioClient()->Init(GetSystemBus()); GetCrosDisksClient()->Init(GetSystemBus()); @@ -397,11 +391,6 @@ void DBusThreadManagerSetter::SetAmplifierClient( DBusThreadManager::Get()->client_bundle_->amplifier_client_ = client.Pass(); } -void DBusThreadManagerSetter::SetArcBridgeClient( - scoped_ptr<ArcBridgeClient> client) { - DBusThreadManager::Get()->client_bundle_->arc_bridge_client_ = client.Pass(); -} - void DBusThreadManagerSetter::SetAudioDspClient( scoped_ptr<AudioDspClient> client) { DBusThreadManager::Get()->client_bundle_->audio_dsp_client_ = client.Pass(); diff --git a/chromeos/dbus/dbus_thread_manager.h b/chromeos/dbus/dbus_thread_manager.h index eaf9109..83f3c26 100644 --- a/chromeos/dbus/dbus_thread_manager.h +++ b/chromeos/dbus/dbus_thread_manager.h @@ -27,7 +27,6 @@ namespace chromeos { // Style Note: Clients are sorted by names. class AmplifierClient; class ApManagerClient; -class ArcBridgeClient; class AudioDspClient; class CrasAudioClient; class CrosDisksClient; @@ -112,7 +111,6 @@ class CHROMEOS_EXPORT DBusThreadManager { // pointers after DBusThreadManager has been shut down. AmplifierClient* GetAmplifierClient(); ApManagerClient* GetApManagerClient(); - ArcBridgeClient* GetArcBridgeClient(); AudioDspClient* GetAudioDspClient(); CrasAudioClient* GetCrasAudioClient(); CrosDisksClient* GetCrosDisksClient(); @@ -187,7 +185,6 @@ class CHROMEOS_EXPORT DBusThreadManagerSetter { ~DBusThreadManagerSetter(); void SetAmplifierClient(scoped_ptr<AmplifierClient> client); - void SetArcBridgeClient(scoped_ptr<ArcBridgeClient> client); void SetAudioDspClient(scoped_ptr<AudioDspClient> client); void SetCrasAudioClient(scoped_ptr<CrasAudioClient> client); void SetCrosDisksClient(scoped_ptr<CrosDisksClient> client); diff --git a/chromeos/dbus/fake_arc_bridge_client.cc b/chromeos/dbus/fake_arc_bridge_client.cc deleted file mode 100644 index d14df0e..0000000 --- a/chromeos/dbus/fake_arc_bridge_client.cc +++ /dev/null @@ -1,36 +0,0 @@ -// 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 "chromeos/dbus/fake_arc_bridge_client.h" - -#include "base/bind.h" -#include "base/location.h" -#include "base/single_thread_task_runner.h" -#include "base/thread_task_runner_handle.h" - -namespace chromeos { - -namespace { - -void OnVoidDBusMethod(const VoidDBusMethodCallback& callback) { - callback.Run(DBUS_METHOD_CALL_SUCCESS); -} - -} // anonymous namespace - -FakeArcBridgeClient::FakeArcBridgeClient() { -} - -FakeArcBridgeClient::~FakeArcBridgeClient() { -} - -void FakeArcBridgeClient::Init(dbus::Bus* bus) { -} - -void FakeArcBridgeClient::Ping(const VoidDBusMethodCallback& callback) { - base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, base::Bind(&OnVoidDBusMethod, callback)); -} - -} // namespace chromeos diff --git a/chromeos/dbus/fake_arc_bridge_client.h b/chromeos/dbus/fake_arc_bridge_client.h deleted file mode 100644 index eb41b50..0000000 --- a/chromeos/dbus/fake_arc_bridge_client.h +++ /dev/null @@ -1,33 +0,0 @@ -// 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. - -#ifndef CHROMEOS_FAKE_ARC_BRIDGE_CLIENT_CLIENT_H_ -#define CHROMEOS_FAKE_ARC_BRIDGE_CLIENT_CLIENT_H_ - -#include "base/basictypes.h" -#include "chromeos/chromeos_export.h" -#include "chromeos/dbus/arc_bridge_client.h" -#include "chromeos/dbus/dbus_client.h" - -namespace chromeos { - -// A fake implementation of ArcBridgeClient. -class CHROMEOS_EXPORT FakeArcBridgeClient : public ArcBridgeClient { - public: - FakeArcBridgeClient(); - ~FakeArcBridgeClient() override; - - // DBusClient overrides: - void Init(dbus::Bus* bus) override; - - // ArcBridgeClient overrides: - void Ping(const VoidDBusMethodCallback& callback) override; - - private: - DISALLOW_COPY_AND_ASSIGN(FakeArcBridgeClient); -}; - -} // namespace chromeos - -#endif // CHROMEOS_FAKE_ARC_BRIDGE_CLIENT_CLIENT_H_ |