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

Unified Diff: chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc

Issue 2142463002: ash: Remove media dependency from ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: oops Created 4 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/webui/options/chromeos/change_picture_options_handler.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
diff --git a/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc b/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
index bd179436f651c9b5773bbdcae93d2bdc7ac98e57..649d0fb971de2a08e2a726f341a4477230a95024 100644
--- a/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h"
-#include "ash/audio/sounds.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/command_line.h"
@@ -14,6 +13,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
#include "chrome/browser/chromeos/camera_presence_notifier.h"
#include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
@@ -35,6 +35,7 @@
#include "content/public/browser/web_ui.h"
#include "content/public/common/url_constants.h"
#include "grit/browser_resources.h"
+#include "media/audio/sounds/sounds_manager.h"
#include "net/base/data_url.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
@@ -170,12 +171,14 @@ void ChangePictureHandler::HandleChooseFile(const base::ListValue* args) {
void ChangePictureHandler::HandleDiscardPhoto(const base::ListValue* args) {
DCHECK(args->empty());
- ash::PlaySystemSoundIfSpokenFeedback(SOUND_OBJECT_DELETE);
+ AccessibilityManager::Get()->PlayEarcon(
+ SOUND_OBJECT_DELETE, PlaySoundOption::SPOKEN_FEEDBACK_ENABLED);
}
void ChangePictureHandler::HandlePhotoTaken(const base::ListValue* args) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- ash::PlaySystemSoundIfSpokenFeedback(SOUND_CAMERA_SNAP);
+ AccessibilityManager::Get()->PlayEarcon(
+ SOUND_CAMERA_SNAP, PlaySoundOption::SPOKEN_FEEDBACK_ENABLED);
std::string image_url;
if (!args || args->GetSize() != 1 || !args->GetString(0, &image_url))
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698