| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "ash/system/chromeos/audio/tray_audio.h" | 5 #include "ash/system/chromeos/audio/tray_audio.h" |
| 6 | 6 |
| 7 #include <cmath> | 7 #include <cmath> |
| 8 | 8 |
| 9 #include "ash/ash_constants.h" | 9 #include "ash/ash_constants.h" |
| 10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
| (...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 589 } else if (volume_view_) { | 589 } else if (volume_view_) { |
| 590 volume_view_ = NULL; | 590 volume_view_ = NULL; |
| 591 pop_up_volume_view_ = false; | 591 pop_up_volume_view_ = false; |
| 592 } | 592 } |
| 593 } | 593 } |
| 594 | 594 |
| 595 bool TrayAudio::ShouldHideArrow() const { | 595 bool TrayAudio::ShouldHideArrow() const { |
| 596 return true; | 596 return true; |
| 597 } | 597 } |
| 598 | 598 |
| 599 bool TrayAudio::ShouldShowLauncher() const { | 599 bool TrayAudio::ShouldShowShelf() const { |
| 600 return ash::switches::ShowAudioDeviceMenu() && !pop_up_volume_view_; | 600 return ash::switches::ShowAudioDeviceMenu() && !pop_up_volume_view_; |
| 601 } | 601 } |
| 602 | 602 |
| 603 void TrayAudio::OnOutputVolumeChanged() { | 603 void TrayAudio::OnOutputVolumeChanged() { |
| 604 float percent = GetVolumeLevel(); | 604 float percent = GetVolumeLevel(); |
| 605 if (tray_view()) | 605 if (tray_view()) |
| 606 tray_view()->SetVisible(GetInitialVisibility()); | 606 tray_view()->SetVisible(GetInitialVisibility()); |
| 607 | 607 |
| 608 if (volume_view_) { | 608 if (volume_view_) { |
| 609 volume_view_->SetVolumeLevel(percent); | 609 volume_view_->SetVolumeLevel(percent); |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 651 if (audio_detail_) | 651 if (audio_detail_) |
| 652 audio_detail_->Update(); | 652 audio_detail_->Update(); |
| 653 if (volume_view_) { | 653 if (volume_view_) { |
| 654 volume_view_->SetVolumeLevel(GetVolumeLevel()); | 654 volume_view_->SetVolumeLevel(GetVolumeLevel()); |
| 655 volume_view_->Update(); | 655 volume_view_->Update(); |
| 656 } | 656 } |
| 657 } | 657 } |
| 658 | 658 |
| 659 } // namespace internal | 659 } // namespace internal |
| 660 } // namespace ash | 660 } // namespace ash |
| OLD | NEW |