chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc - Issue 549453005: Run athena on device

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 549453005: Run athena on device (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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

« chrome/browser/chromeos/login/lock/screen_locker.cc ('K') | « chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc ('k') | no next file » | 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 52bed9d6e0d75a89c1f7c13dca555e1b7bb495d8..5d6d7748c1de8a25ef7c76ccaf5be150ef065810 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

@@ -215,13 +215,18 @@ void ChangePictureOptionsHandler::HandleChooseFile(

void ChangePictureOptionsHandler::HandleTakePhoto(

const base::ListValue* args) {

DCHECK(args->empty());

+#if !defined(USE_ATHENA)

+ // crbug.com/408733

ash::PlaySystemSoundIfSpokenFeedback(SOUND_CAMERA_SNAP);

+#endif

}

void ChangePictureOptionsHandler::HandleDiscardPhoto(

const base::ListValue* args) {

DCHECK(args->empty());

+#if !defined(USE_ATHENA)

ash::PlaySystemSoundIfSpokenFeedback(SOUND_OBJECT_DELETE);

+#endif

}

void ChangePictureOptionsHandler::HandlePhotoTaken(