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

Unified Diff: chrome/browser/ui/views/ash/volume_controller_chromeos.cc

Issue 10694127: browser: Move some ash files into ui/ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/ash/volume_controller_chromeos.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/ash/volume_controller_chromeos.cc
diff --git a/chrome/browser/ui/views/ash/volume_controller_chromeos.cc b/chrome/browser/ui/views/ash/volume_controller_chromeos.cc
deleted file mode 100644
index 887bc7b65821be67eb3ea2f5aa3133d6f232a735..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/views/ash/volume_controller_chromeos.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/ui/views/ash/volume_controller_chromeos.h"
-
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/audio/audio_handler.h"
-#include "chrome/browser/extensions/system/system_api.h"
-#include "content/public/browser/user_metrics.h"
-
-namespace {
-
-// Percent by which the volume should be changed when a volume key is pressed.
-const double kStepPercentage = 4.0;
-
-} // namespace
-
-bool VolumeController::HandleVolumeMute(const ui::Accelerator& accelerator) {
- if (accelerator.key_code() == ui::VKEY_F8)
- content::RecordAction(content::UserMetricsAction("Accel_VolumeMute_F8"));
-
- chromeos::AudioHandler* audio_handler = chromeos::AudioHandler::GetInstance();
-
- // Always muting (and not toggling) as per final decision on
- // http://crosbug.com/3751
- audio_handler->SetMuted(true);
-
- extensions::DispatchVolumeChangedEvent(audio_handler->GetVolumePercent(),
- audio_handler->IsMuted());
- return true;
-}
-
-bool VolumeController::HandleVolumeDown(const ui::Accelerator& accelerator) {
- if (accelerator.key_code() == ui::VKEY_F9)
- content::RecordAction(content::UserMetricsAction("Accel_VolumeDown_F9"));
-
- chromeos::AudioHandler* audio_handler = chromeos::AudioHandler::GetInstance();
- if (audio_handler->IsMuted())
- audio_handler->SetVolumePercent(0.0);
- else
- audio_handler->AdjustVolumeByPercent(-kStepPercentage);
-
- extensions::DispatchVolumeChangedEvent(audio_handler->GetVolumePercent(),
- audio_handler->IsMuted());
- return true;
-}
-
-bool VolumeController::HandleVolumeUp(const ui::Accelerator& accelerator) {
- if (accelerator.key_code() == ui::VKEY_F10)
- content::RecordAction(content::UserMetricsAction("Accel_VolumeUp_F10"));
-
- chromeos::AudioHandler* audio_handler = chromeos::AudioHandler::GetInstance();
- if (audio_handler->IsMuted()) {
- audio_handler->SetMuted(false);
- // If volume percent is still 0.0 after reset the mute status, it means that
- // the mute status was done by VolumeDown, so we need to increase
- // the volume as usual.
- if (audio_handler->GetVolumePercent() == 0.0)
- audio_handler->AdjustVolumeByPercent(kStepPercentage);
- } else {
- audio_handler->AdjustVolumeByPercent(kStepPercentage);
- }
-
- extensions::DispatchVolumeChangedEvent(audio_handler->GetVolumePercent(),
- audio_handler->IsMuted());
- return true;
-}
-
-void VolumeController::SetVolumePercent(double percent) {
- chromeos::AudioHandler* audio_handler = chromeos::AudioHandler::GetInstance();
- audio_handler->SetVolumePercent(percent);
- extensions::DispatchVolumeChangedEvent(audio_handler->GetVolumePercent(),
- audio_handler->IsMuted());
-}
« no previous file with comments | « chrome/browser/ui/views/ash/volume_controller_chromeos.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698