Spoken feedback sounds for user photo capture/discard at image picker added.

chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc

 // Copyright (c) 2013 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/webui/chromeos/login/user_image_screen_handler.h"
 
+#include "ash/audio/sounds.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
+#include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
+#include "chromeos/audio/chromeos_sounds.h"
+#include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "net/base/data_url.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "url/gurl.h"
 
 namespace {
 
 const char kJsScreenPath[] = "login.UserImageScreen";
 
 }  // namespace
 
 namespace chromeos {
 
 UserImageScreenHandler::UserImageScreenHandler()
     : BaseScreenHandler(kJsScreenPath),
       screen_(NULL),
       show_on_init_(false),
       is_ready_(false) {
+

[Nikita (slow), 2014/02/14 11:13:30]

nit: drop empty line

+  ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
+  media::SoundsManager* manager = media::SoundsManager::Get();
+  manager->Initialize(SOUND_OBJECT_DELETE,
+                      bundle.GetRawDataResource(IDR_SOUND_OBJECT_DELETE_WAV));
+  manager->Initialize(SOUND_CAMERA_SNAP,
+                      bundle.GetRawDataResource(IDR_SOUND_CAMERA_SNAP_WAV));
 }
 
 UserImageScreenHandler::~UserImageScreenHandler() {
   if (screen_)
     screen_->OnActorDestroyed(this);
 }
 
 void UserImageScreenHandler::Initialize() {
   if (show_on_init_) {
     Show();
@@ skipping 37 matching lines @@
                IDS_OPTIONS_CHANGE_PICTURE_DIALOG_TEXT);
   builder->Add("takePhoto", IDS_OPTIONS_CHANGE_PICTURE_TAKE_PHOTO);
   builder->Add("discardPhoto", IDS_OPTIONS_CHANGE_PICTURE_DISCARD_PHOTO);
   builder->Add("flipPhoto", IDS_OPTIONS_CHANGE_PICTURE_FLIP_PHOTO);
   builder->Add("profilePhoto", IDS_IMAGE_SCREEN_PROFILE_PHOTO);
   builder->Add("profilePhotoLoading",
                IDS_IMAGE_SCREEN_PROFILE_LOADING_PHOTO);
   builder->Add("okButtonText", IDS_OK);
   builder->Add("authorCredit", IDS_OPTIONS_SET_WALLPAPER_AUTHOR_TEXT);
   builder->Add("photoFromCamera", IDS_OPTIONS_CHANGE_PICTURE_PHOTO_FROM_CAMERA);
+  builder->Add("photoFlippedAccessibleText",
+               IDS_OPTIONS_PHOTO_FLIP_ACCESSIBLE_TEXT);
+  builder->Add("photoFlippedBackAccessibleText",
+               IDS_OPTIONS_PHOTO_FLIPBACK_ACCESSIBLE_TEXT);
   builder->Add("photoCaptureAccessibleText",
                IDS_OPTIONS_PHOTO_CAPTURE_ACCESSIBLE_TEXT);
   builder->Add("photoDiscardAccessibleText",
                IDS_OPTIONS_PHOTO_DISCARD_ACCESSIBLE_TEXT);
   builder->Add("syncingPreferences", IDS_IMAGE_SCREEN_SYNCING_PREFERENCES);
 }
 
 void UserImageScreenHandler::RegisterMessages() {
   AddCallback("getImages", &UserImageScreenHandler::HandleGetImages);
   AddCallback("screenReady", &UserImageScreenHandler::HandleScreenReady);
+  AddCallback("takePhoto", &UserImageScreenHandler::HandleTakePhoto);
+  AddCallback("discardPhoto", &UserImageScreenHandler::HandleDiscardPhoto);
   AddCallback("photoTaken", &UserImageScreenHandler::HandlePhotoTaken);
   AddCallback("selectImage", &UserImageScreenHandler::HandleSelectImage);
   AddCallback("checkCameraPresence",
               &UserImageScreenHandler::HandleCheckCameraPresence);
   AddCallback("onUserImageAccepted",
               &UserImageScreenHandler::HandleImageAccepted);
   AddCallback("onUserImageScreenShown",
               &UserImageScreenHandler::HandleScreenShown);
 }
 
@@ skipping 48 matching lines @@
 void UserImageScreenHandler::HandlePhotoTaken(const std::string& image_url) {
   std::string mime_type, charset, raw_data;
   if (!net::DataURL::Parse(GURL(image_url), &mime_type, &charset, &raw_data))
     NOTREACHED();
   DCHECK_EQ("image/png", mime_type);
 
   if (screen_)
     screen_->OnPhotoTaken(raw_data);
 }
 
+void UserImageScreenHandler::HandleTakePhoto() {
+  ash::PlaySystemSound(SOUND_CAMERA_SNAP,
+                       true /* honor_spoken_feedback */);
+}
+
+void UserImageScreenHandler::HandleDiscardPhoto() {
+  ash::PlaySystemSound(SOUND_OBJECT_DELETE,
+                       true /* honor_spoken_feedback */);
+}
+
 void UserImageScreenHandler::HandleCheckCameraPresence() {
   if (!screen_)
     return;
   screen_->CheckCameraPresence();
 }
 
 void UserImageScreenHandler::HandleSelectImage(const std::string& image_url,
                                                const std::string& image_type,
                                                bool is_user_selection) {
   if (screen_)
@@ skipping 19 matching lines @@
 
 void UserImageScreenHandler::HideCurtain() {
   CallJS("hideCurtain");
 }
 
 void UserImageScreenHandler::SetProfilePictureEnabled(bool enabled) {
   CallJS("setProfilePictureEnabled", enabled);
 }
 
 }  // namespace chromeos