Persist the user's active audio device choice across chromeos session and reboots.

chromeos/audio/audio_devices_pref_handler_impl.cc

 // Copyright (c) 2013 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/audio/audio_devices_pref_handler_impl.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 
@@ skipping 67 matching lines @@
   return (mute == kPrefMuteOn);
 }
 
 void AudioDevicesPrefHandlerImpl::SetMuteValue(const AudioDevice& device,
                                                bool mute) {
   device_mute_settings_->SetInteger(GetDeviceIdString(device),
                                     mute ? kPrefMuteOn : kPrefMuteOff);
   SaveDevicesMutePref();
 }
 
-AudioDeviceState AudioDevicesPrefHandlerImpl::GetDeviceState(
-    const AudioDevice& device) {
-  std::string device_id_str = GetDeviceIdString(device);
-  if (!device_state_settings_->HasKey(device_id_str)) {
-    device_state_settings_->SetInteger(
-        device_id_str, static_cast<int>(AUDIO_STATE_NOT_AVAILABLE));
-    SaveDevicesStatePref();
-  }
-  int state = static_cast<int>(AUDIO_STATE_NOT_AVAILABLE);
-  device_state_settings_->GetInteger(device_id_str, &state);
-  return (AudioDeviceState)state;
-}
+void AudioDevicesPrefHandlerImpl::SetDeviceActive(const AudioDevice& device,
+                                                  bool active,
+                                                  bool activate_by_user) {
+  scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
+  dict->SetBoolean("active", active);
+  if (active)
+    dict->SetBoolean("activate_by_user", activate_by_user);
 
-void AudioDevicesPrefHandlerImpl::SetDeviceState(const AudioDevice& device,
-                                                 AudioDeviceState state) {
-  device_state_settings_->SetInteger(GetDeviceIdString(device),
-                                     static_cast<int>(state));
+  device_state_settings_->Set(GetDeviceIdString(device), std::move(dict));
   SaveDevicesStatePref();
 }
 
+bool AudioDevicesPrefHandlerImpl::GetDeviceActive(const AudioDevice& device,
+                                                  bool* active,
+                                                  bool* activate_by_user) {
+  const std::string device_id_str = GetDeviceIdString(device);
+  if (!device_state_settings_->HasKey(device_id_str))
+    return false;
+
+  base::DictionaryValue* dict = NULL;
+  if (!device_state_settings_->GetDictionary(device_id_str, &dict)) {
+    LOG(ERROR) << "Could not get device state for device:" << device.ToString();
+    return false;
+  }
+  if (!dict->GetBoolean("active", active)) {
+    LOG(ERROR) << "Could not get active value for device:" << device.ToString();
+    return false;
+  }
+
+  if (*active && !dict->GetBoolean("activate_by_user", activate_by_user)) {
+    LOG(ERROR) << "Could not get activate_by_user value for previously "
+                  "active device:"
+               << device.ToString();
+    return false;
+  }
+
+  return true;
+}
+
 bool AudioDevicesPrefHandlerImpl::GetAudioOutputAllowedValue() {
   return local_state_->GetBoolean(prefs::kAudioOutputAllowed);
 }
 
 void AudioDevicesPrefHandlerImpl::AddAudioPrefObserver(
     AudioPrefObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void AudioDevicesPrefHandlerImpl::RemoveAudioPrefObserver(
@@ skipping 119 matching lines @@
   // media system.
   registry->RegisterBooleanPref(prefs::kAudioOutputAllowed, true);
 
   // Register the legacy audio prefs for migration.
   registry->RegisterDoublePref(prefs::kAudioVolumePercent,
                                kDefaultOutputVolumePercent);
   registry->RegisterIntegerPref(prefs::kAudioMute, kPrefMuteOff);
 }
 
 }  // namespace chromeos