ChromeOS mixer: Talk to new ChromeOS audio server.

chrome/browser/chromeos/audio/audio_handler.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/audio/audio_handler.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "chrome/browser/browser_process.h"
+#if defined(USE_CRAS)
+#include "chrome/browser/chromeos/audio/audio_mixer_cras.h"
+#else
 #include "chrome/browser/chromeos/audio/audio_mixer_alsa.h"
+#endif
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 
 using std::max;
 using std::min;
 
 namespace chromeos {
 
 namespace {
@@ skipping 79 matching lines @@
 
 void AudioHandler::AddVolumeObserver(VolumeObserver* observer) {
   volume_observers_.AddObserver(observer);
 }
 
 void AudioHandler::RemoveVolumeObserver(VolumeObserver* observer) {
   volume_observers_.RemoveObserver(observer);
 }
 
 AudioHandler::AudioHandler()
+#if defined(USE_CRAS)
+    : mixer_(new AudioMixerCras()),
+#else
     : mixer_(new AudioMixerAlsa()),
+#endif
       prefs_(g_browser_process->local_state()) {
   mixer_->SetVolumePercent(prefs_->GetDouble(prefs::kAudioVolumePercent));
   mixer_->SetMuted(prefs_->GetInteger(prefs::kAudioMute) == kPrefMuteOn);
   mixer_->Init();
 }
 
 AudioHandler::~AudioHandler() {
   mixer_.reset();
 };
 
 }  // namespace chromeos