chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc - Issue 2142463002: ash: Remove media dependency from ash.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/options/chromeos/change_picture_options_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/chromeos/login/user_image_screen_handler.cc ('k') | chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

index 60cd3650a0db4391dc91d8c02e0b6d93ab48a6ae..d9f87d939805e99c819be22bb92afbc262a29db9 100644

--- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

@@ -4,7 +4,6 @@

#include "chrome/browser/ui/webui/options/chromeos/change_picture_options_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"

@@ -214,13 +215,15 @@ void ChangePictureOptionsHandler::HandleChooseFile(

void ChangePictureOptionsHandler::HandleTakePhoto(

const base::ListValue* args) {

DCHECK(args->empty());

- ash::PlaySystemSoundIfSpokenFeedback(SOUND_CAMERA_SNAP);

+ AccessibilityManager::Get()->PlayEarcon(

+ SOUND_CAMERA_SNAP, PlaySoundOption::SPOKEN_FEEDBACK_ENABLED);

}

void ChangePictureOptionsHandler::HandleDiscardPhoto(

const base::ListValue* args) {

DCHECK(args->empty());

- ash::PlaySystemSoundIfSpokenFeedback(SOUND_OBJECT_DELETE);

+ AccessibilityManager::Get()->PlayEarcon(

+ SOUND_OBJECT_DELETE, PlaySoundOption::SPOKEN_FEEDBACK_ENABLED);

}

void ChangePictureOptionsHandler::HandlePhotoTaken(