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

Side by Side Diff: chrome/browser/ui/ash/volume_controller_chromeos.cc

Issue 2074213002: mash: Move ash_switches.* to ash/common; cleanup DEPS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix broken relative include. Created 4 years, 6 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
OLDNEW
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/ash/volume_controller_chromeos.h" 5 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"
6 6
7 #include "ash/ash_switches.h"
8 #include "ash/audio/sounds.h" 7 #include "ash/audio/sounds.h"
8 #include "ash/common/ash_switches.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/extensions/api/system_private/system_private_api.h" 11 #include "chrome/browser/extensions/api/system_private/system_private_api.h"
12 #include "chromeos/audio/chromeos_sounds.h" 12 #include "chromeos/audio/chromeos_sounds.h"
13 #include "chromeos/chromeos_switches.h" 13 #include "chromeos/chromeos_switches.h"
14 #include "content/public/browser/user_metrics.h" 14 #include "content/public/browser/user_metrics.h"
15 #include "grit/browser_resources.h" 15 #include "grit/browser_resources.h"
16 #include "media/audio/sounds/sounds_manager.h" 16 #include "media/audio/sounds/sounds_manager.h"
17 #include "ui/base/resource/resource_bundle.h" 17 #include "ui/base/resource/resource_bundle.h"
18 18
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 audio_handler->IsOutputMuted()); 99 audio_handler->IsOutputMuted());
100 } 100 }
101 101
102 void VolumeController::OnOutputMuteChanged(bool /* mute_on */, 102 void VolumeController::OnOutputMuteChanged(bool /* mute_on */,
103 bool /* system_adjust */) { 103 bool /* system_adjust */) {
104 CrasAudioHandler* audio_handler = CrasAudioHandler::Get(); 104 CrasAudioHandler* audio_handler = CrasAudioHandler::Get();
105 extensions::DispatchVolumeChangedEvent( 105 extensions::DispatchVolumeChangedEvent(
106 audio_handler->GetOutputVolumePercent(), 106 audio_handler->GetOutputVolumePercent(),
107 audio_handler->IsOutputMuted()); 107 audio_handler->IsOutputMuted());
108 } 108 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698