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

Unified Diff: chromeos/dbus/cras_audio_client_stub_impl.cc

Issue 515573003: app_shell: Do simple audio initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: wrap line Created 6 years, 4 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
« no previous file with comments | « chromeos/dbus/cras_audio_client_stub_impl.h ('k') | chromeos/dbus/dbus_thread_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/cras_audio_client_stub_impl.cc
diff --git a/chromeos/dbus/cras_audio_client_stub_impl.cc b/chromeos/dbus/cras_audio_client_stub_impl.cc
index 633db7b2f68993a089791d72e1065e08afd4f596..e05b53fba6285c180df30e9e73ee2ea83b0ffdf9 100644
--- a/chromeos/dbus/cras_audio_client_stub_impl.cc
+++ b/chromeos/dbus/cras_audio_client_stub_impl.cc
@@ -11,6 +11,9 @@ CrasAudioClientStubImpl::CrasAudioClientStubImpl()
active_output_node_id_(0) {
}
+CrasAudioClientStubImpl::~CrasAudioClientStubImpl() {
+}
+
void CrasAudioClientStubImpl::Init(dbus::Bus* bus) {
VLOG(1) << "CrasAudioClientStubImpl is created";
@@ -57,9 +60,6 @@ void CrasAudioClientStubImpl::Init(dbus::Bus* bus) {
node_list_.push_back(node_5);
}
-CrasAudioClientStubImpl::~CrasAudioClientStubImpl() {
-}
-
void CrasAudioClientStubImpl::AddObserver(Observer* observer) {
observers_.AddObserver(observer);
}
@@ -164,15 +164,14 @@ void CrasAudioClientStubImpl::RemoveActiveOutputNode(uint64 node_id) {
}
}
-void CrasAudioClientStubImpl::SetAudioDevices(
+void CrasAudioClientStubImpl::SetAudioNodesForTesting(
const AudioNodeList& audio_nodes) {
- node_list_.clear();
- for (size_t i = 0; i < audio_nodes.size(); ++i)
- node_list_.push_back(audio_nodes[i]);
+ node_list_ = audio_nodes;
}
-void CrasAudioClientStubImpl::ChangeAudioNodes(const AudioNodeList& new_nodes) {
- SetAudioDevices(new_nodes);
+void CrasAudioClientStubImpl::SetAudioNodesAndNotifyObserversForTesting(
+ const AudioNodeList& new_nodes) {
+ SetAudioNodesForTesting(new_nodes);
FOR_EACH_OBSERVER(Observer, observers_, NodesChanged());
}
« no previous file with comments | « chromeos/dbus/cras_audio_client_stub_impl.h ('k') | chromeos/dbus/dbus_thread_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698