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

Issue 2483393002: chromeos: Combine TrayAudio and TrayAudioChromeOs classes (Closed)

Created:
4 years, 1 month ago by James Cook
Modified:
4 years, 1 month ago
Reviewers:
jennyz
CC:
chromium-reviews, kalyank, sadrul, oshima+watch_chromium.org
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

chromeos: Combine TrayAudio and TrayAudioChromeOs classes The two classes were split when we supported ash on Windows. We don't support ash on Windows anymore, so the two can be combined. This is a pure refactor with no functional changes. After doing this we can make TrayAudio directly observe CrasAudioHandler, which will eliminate the audio observer code in SystemTrayNotifier and allow some ash-specific code to be removed from chrome's SystemTrayDelegateChromeos. This also moves all tray audio code into ash/common/system/chromeos/audio. TODO: Eliminate TrayAudioDelegate and inline the code into TrayAudio. BUG=661247 TEST=manual testing on device of input switching and volume changes Committed: https://crrev.com/96ea4cf812df1ac6c0a0dbd5eed579a2fb1c7e39 Cr-Commit-Position: refs/heads/master@{#431479}

Patch Set 1 #

Patch Set 2 : cleaner diff #

Patch Set 3 : even cleaner diff #

Patch Set 4 : cleanest diff ever #

Total comments: 2

Patch Set 5 : nullptr #

Patch Set 6 : rebase #

Unified diffs Side-by-side diffs Delta from patch set Stats (+163 lines, -1097 lines) Patch
M ash/BUILD.gn View 1 chunk +6 lines, -8 lines 0 comments Download
D ash/common/system/audio/audio_observer.h View 1 chunk +0 lines, -41 lines 0 comments Download
D ash/common/system/audio/tray_audio.h View 1 chunk +0 lines, -79 lines 0 comments Download
D ash/common/system/audio/tray_audio.cc View 1 chunk +0 lines, -184 lines 0 comments Download
D ash/common/system/audio/tray_audio_delegate.h View 1 chunk +0 lines, -72 lines 0 comments Download
D ash/common/system/audio/volume_view.h View 1 2 3 4 5 1 chunk +0 lines, -83 lines 0 comments Download
D ash/common/system/audio/volume_view.cc View 1 2 3 4 5 1 chunk +0 lines, -347 lines 0 comments Download
A + ash/common/system/chromeos/audio/audio_observer.h View 2 chunks +3 lines, -3 lines 0 comments Download
A + ash/common/system/chromeos/audio/tray_audio.h View 1 2 3 3 chunks +31 lines, -22 lines 0 comments Download
A + ash/common/system/chromeos/audio/tray_audio.cc View 1 2 3 4 7 chunks +56 lines, -44 lines 0 comments Download
D ash/common/system/chromeos/audio/tray_audio_chromeos.h View 1 chunk +0 lines, -52 lines 0 comments Download
D ash/common/system/chromeos/audio/tray_audio_chromeos.cc View 1 chunk +0 lines, -96 lines 0 comments Download
A + ash/common/system/chromeos/audio/tray_audio_delegate.h View 3 chunks +4 lines, -4 lines 0 comments Download
M ash/common/system/chromeos/audio/tray_audio_delegate_chromeos.h View 1 chunk +1 line, -1 line 0 comments Download
A + ash/common/system/chromeos/audio/volume_view.h View 1 2 3 4 5 2 chunks +3 lines, -3 lines 0 comments Download
A + ash/common/system/chromeos/audio/volume_view.cc View 1 2 3 4 5 2 chunks +4 lines, -6 lines 0 comments Download
M ash/common/system/tray/system_tray.cc View 1 2 3 4 5 2 chunks +2 lines, -2 lines 0 comments Download
M ash/common/system/tray/system_tray_notifier.h View 5 chunks +11 lines, -11 lines 0 comments Download
M ash/common/system/tray/system_tray_notifier.cc View 3 chunks +38 lines, -36 lines 0 comments Download
M ash/wm/power_button_controller.cc View 4 chunks +4 lines, -3 lines 0 comments Download

Messages

Total messages: 21 (14 generated)
James Cook
jennyz, please take a look.
4 years, 1 month ago (2016-11-09 01:01:20 UTC) #5
James Cook
On 2016/11/09 01:01:20, James Cook wrote: > jennyz, please take a look. jennyz, friendly ping?
4 years, 1 month ago (2016-11-10 00:20:07 UTC) #13
jennyz
lgtm with a nit https://codereview.chromium.org/2483393002/diff/60001/ash/common/system/chromeos/audio/tray_audio.cc File ash/common/system/chromeos/audio/tray_audio.cc (right): https://codereview.chromium.org/2483393002/diff/60001/ash/common/system/chromeos/audio/tray_audio.cc#newcode72 ash/common/system/chromeos/audio/tray_audio.cc:72: volume_view_ = NULL; NULL -> ...
4 years, 1 month ago (2016-11-11 00:07:55 UTC) #14
James Cook
Thanks for the review. https://codereview.chromium.org/2483393002/diff/60001/ash/common/system/chromeos/audio/tray_audio.cc File ash/common/system/chromeos/audio/tray_audio.cc (right): https://codereview.chromium.org/2483393002/diff/60001/ash/common/system/chromeos/audio/tray_audio.cc#newcode72 ash/common/system/chromeos/audio/tray_audio.cc:72: volume_view_ = NULL; On 2016/11/11 ...
4 years, 1 month ago (2016-11-11 01:32:44 UTC) #15
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2483393002/100001
4 years, 1 month ago (2016-11-11 01:55:05 UTC) #18
commit-bot: I haz the power
Committed patchset #6 (id:100001)
4 years, 1 month ago (2016-11-11 03:10:58 UTC) #19
commit-bot: I haz the power
4 years, 1 month ago (2016-11-11 03:15:42 UTC) #21
Message was sent while issue was closed.
Patchset 6 (id:??) landed as
https://crrev.com/96ea4cf812df1ac6c0a0dbd5eed579a2fb1c7e39
Cr-Commit-Position: refs/heads/master@{#431479}

Powered by Google App Engine
This is Rietveld 408576698