| OLD | NEW |
| 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_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_CHROMEOS_H_ | 5 #ifndef ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_CHROMEOS_H_ |
| 6 #define ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_CHROMEOS_H_ | 6 #define ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_CHROMEOS_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 | 26 |
| 27 protected: | 27 protected: |
| 28 // Overridden from TrayAudio | 28 // Overridden from TrayAudio |
| 29 void Update() override; | 29 void Update() override; |
| 30 | 30 |
| 31 private: | 31 private: |
| 32 // Overridden from SystemTrayItem. | 32 // Overridden from SystemTrayItem. |
| 33 views::View* CreateDetailedView(user::LoginStatus status) override; | 33 views::View* CreateDetailedView(user::LoginStatus status) override; |
| 34 void DestroyDetailedView() override; | 34 void DestroyDetailedView() override; |
| 35 | 35 |
| 36 // Overridden from gfx::DisplayObserver. | 36 // Overridden from display::DisplayObserver. |
| 37 void OnDisplayAdded(const gfx::Display& new_display) override; | 37 void OnDisplayAdded(const display::Display& new_display) override; |
| 38 void OnDisplayRemoved(const gfx::Display& old_display) override; | 38 void OnDisplayRemoved(const display::Display& old_display) override; |
| 39 void OnDisplayMetricsChanged(const gfx::Display& display, | 39 void OnDisplayMetricsChanged(const display::Display& display, |
| 40 uint32_t changed_metrics) override; | 40 uint32_t changed_metrics) override; |
| 41 | 41 |
| 42 // Overriden from chromeos::PowerManagerClient::Observer. | 42 // Overriden from chromeos::PowerManagerClient::Observer. |
| 43 void SuspendDone(const base::TimeDelta& sleep_duration) override; | 43 void SuspendDone(const base::TimeDelta& sleep_duration) override; |
| 44 | 44 |
| 45 tray::AudioDetailedView* audio_detail_view_; | 45 tray::AudioDetailedView* audio_detail_view_; |
| 46 | 46 |
| 47 DISALLOW_COPY_AND_ASSIGN(TrayAudioChromeOs); | 47 DISALLOW_COPY_AND_ASSIGN(TrayAudioChromeOs); |
| 48 }; | 48 }; |
| 49 | 49 |
| 50 } // namespace ash | 50 } // namespace ash |
| 51 | 51 |
| 52 #endif // ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_CHROMEOS_H_ | 52 #endif // ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_CHROMEOS_H_ |
| OLD | NEW |