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

Side by Side Diff: ash/common/system/chromeos/audio/tray_audio.h

Issue 2700783002: s/\bArc\b/ARC/g for ARC related code. (Closed)
Patch Set: Address ARC++ Created 3 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | ash/public/cpp/shelf_types.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_ 5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_
6 #define ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_ 6 #define ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 18 matching lines...) Expand all
29 29
30 // The system tray item for audio input and output. 30 // The system tray item for audio input and output.
31 class ASH_EXPORT TrayAudio : public TrayImageItem, 31 class ASH_EXPORT TrayAudio : public TrayImageItem,
32 public chromeos::CrasAudioHandler::AudioObserver, 32 public chromeos::CrasAudioHandler::AudioObserver,
33 public display::DisplayObserver, 33 public display::DisplayObserver,
34 public chromeos::PowerManagerClient::Observer { 34 public chromeos::PowerManagerClient::Observer {
35 public: 35 public:
36 explicit TrayAudio(SystemTray* system_tray); 36 explicit TrayAudio(SystemTray* system_tray);
37 ~TrayAudio() override; 37 ~TrayAudio() override;
38 38
39 // Temporarily shows the pop-up volume slider on all displays. Used by ARC++ 39 // Temporarily shows the pop-up volume slider on all displays. Used by ARC
40 // when an Android app changes the system volume. 40 // when an Android app changes the system volume.
41 static void ShowPopUpVolumeView(); 41 static void ShowPopUpVolumeView();
42 42
43 tray::VolumeView* volume_view_for_testing() { return volume_view_; } 43 tray::VolumeView* volume_view_for_testing() { return volume_view_; }
44 bool pop_up_volume_view_for_testing() { return pop_up_volume_view_; } 44 bool pop_up_volume_view_for_testing() { return pop_up_volume_view_; }
45 45
46 private: 46 private:
47 // Overridden from display::DisplayObserver. 47 // Overridden from display::DisplayObserver.
48 void OnDisplayAdded(const display::Display& new_display) override; 48 void OnDisplayAdded(const display::Display& new_display) override;
49 void OnDisplayRemoved(const display::Display& old_display) override; 49 void OnDisplayRemoved(const display::Display& old_display) override;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 bool pop_up_volume_view_; 85 bool pop_up_volume_view_;
86 86
87 tray::AudioDetailedView* audio_detail_view_; 87 tray::AudioDetailedView* audio_detail_view_;
88 88
89 DISALLOW_COPY_AND_ASSIGN(TrayAudio); 89 DISALLOW_COPY_AND_ASSIGN(TrayAudio);
90 }; 90 };
91 91
92 } // namespace ash 92 } // namespace ash
93 93
94 #endif // ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_ 94 #endif // ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_
OLDNEW
« no previous file with comments | « no previous file | ash/public/cpp/shelf_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698