| 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 "chrome/browser/ui/views/aura/volume_controller_chromeos.h" | 5 #include "chrome/browser/ui/views/ash/volume_controller_chromeos.h" |
| 6 | 6 |
| 7 #include "chrome/browser/browser_process.h" | 7 #include "chrome/browser/browser_process.h" |
| 8 #include "chrome/browser/chromeos/audio/audio_handler.h" | 8 #include "chrome/browser/chromeos/audio/audio_handler.h" |
| 9 #include "chrome/browser/chromeos/ui/brightness_bubble.h" | 9 #include "chrome/browser/chromeos/ui/brightness_bubble.h" |
| 10 #include "chrome/browser/chromeos/ui/volume_bubble.h" | 10 #include "chrome/browser/chromeos/ui/volume_bubble.h" |
| 11 #include "chrome/browser/extensions/system/system_api.h" | 11 #include "chrome/browser/extensions/system/system_api.h" |
| 12 #include "content/public/browser/user_metrics.h" | 12 #include "content/public/browser/user_metrics.h" |
| 13 | 13 |
| 14 namespace { | 14 namespace { |
| 15 | 15 |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 audio_handler->SetVolumePercent(kVolumePercentOnVolumeUpWhileMuted); | 74 audio_handler->SetVolumePercent(kVolumePercentOnVolumeUpWhileMuted); |
| 75 } else { | 75 } else { |
| 76 audio_handler->AdjustVolumeByPercent(kStepPercentage); | 76 audio_handler->AdjustVolumeByPercent(kStepPercentage); |
| 77 } | 77 } |
| 78 | 78 |
| 79 extensions::DispatchVolumeChangedEvent(audio_handler->GetVolumePercent(), | 79 extensions::DispatchVolumeChangedEvent(audio_handler->GetVolumePercent(), |
| 80 audio_handler->IsMuted()); | 80 audio_handler->IsMuted()); |
| 81 ShowVolumeBubble(); | 81 ShowVolumeBubble(); |
| 82 return true; | 82 return true; |
| 83 } | 83 } |
| OLD | NEW |