diff options
| author | zturner@chromium.org <zturner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-19 06:09:45 +0000 |
|---|---|---|
| committer | zturner@chromium.org <zturner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-19 06:09:45 +0000 |
| commit | 2a5c5f06f430ffcc53948c9bf1879aa10dbcf244 (patch) | |
| tree | 7abd84d341127b7f9e25b5383bfd812a583edc35 /ash/ash.gyp | |
| parent | 7c82539cd431202668e7ed50737af64506f266e8 (diff) | |
| download | chromium_src-2a5c5f06f430ffcc53948c9bf1879aa10dbcf244.zip chromium_src-2a5c5f06f430ffcc53948c9bf1879aa10dbcf244.tar.gz chromium_src-2a5c5f06f430ffcc53948c9bf1879aa10dbcf244.tar.bz2 | |
Refactor the TrayAudio code so that it can be used by other platforms.
The motivation here is to introduce the volume slider tray UI into
Windows Ash.
This change does not actually add tray audio UI to other platforms,
only moves some non-chromeos specific things out of the chromeos
platform folders, so that we can hook in the native Audio APIs
of other platforms to the tray UI.
At a high level, this change does the following:
1) Move tray_audio out of chromeos/ so that other platforms can
use the UI that it provides.
2) Decouples TrayAudio from CrasAudioHandler by introducing a
new delegate, in a similar vein to what is done with all the other
handlers (e.g. the BluetoothHandler)
3) Move the additional views (VolumeView, etc) to their own files
so they can be used by other platforms as well.
TEST=
On CrOS physical device, verified that:
1) Keyboard volume buttons function appropriately and display the
volume view
2) AudioDetailView still is accessible at the correct times
3) Adjusting the volume (via the keyboard shortcuts or via the
slider) correctly change the output volume.
4) UI still behaves correctly (e.g. icons update as the volume
changes, mute button works, etc).
BUG=227247
Review URL: https://codereview.chromium.org/163953007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash.gyp')
| -rw-r--r-- | ash/ash.gyp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index e37d958..d6697a3 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -266,12 +266,22 @@ 'sticky_keys/sticky_keys_controller.h', 'sticky_keys/sticky_keys_overlay.cc', 'sticky_keys/sticky_keys_overlay.h', + 'system/audio/audio_observer.h', + 'system/audio/tray_audio.cc', + 'system/audio/tray_audio.h', + 'system/audio/tray_audio_delegate.h', + 'system/audio/volume_view.cc', + 'system/audio/volume_view.h', 'system/bluetooth/bluetooth_observer.h', 'system/bluetooth/tray_bluetooth.cc', 'system/bluetooth/tray_bluetooth.h', 'system/brightness_control_delegate.h', - 'system/chromeos/audio/tray_audio.cc', - 'system/chromeos/audio/tray_audio.h', + 'system/chromeos/audio/audio_detailed_view.cc', + 'system/chromeos/audio/audio_detailed_view.h', + 'system/chromeos/audio/tray_audio_chromeos.cc', + 'system/chromeos/audio/tray_audio_chromeos.h', + 'system/chromeos/audio/tray_audio_delegate_chromeos.cc', + 'system/chromeos/audio/tray_audio_delegate_chromeos.h', 'system/chromeos/enterprise/enterprise_domain_observer.h', 'system/chromeos/brightness/brightness_controller_chromeos.cc', 'system/chromeos/brightness/brightness_controller_chromeos.h', |