Chromium Code Reviews| Index: chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc |
| diff --git a/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc |
| index dd36096701767e030d9f1d0c2a2d48d690f3ad52..b6216fe4e8a89ab437832ab322e1f0e5bbb9a00c 100644 |
| --- a/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc |
| +++ b/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc |
| @@ -4,6 +4,7 @@ |
| #include "chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.h" |
| +#include "ash/audio/sounds.h" |
| #include "base/strings/utf_string_conversions.h" |
| #include "base/values.h" |
| #include "chrome/browser/chromeos/login/managed/locally_managed_user_creation_flow.h" |
| @@ -14,11 +15,14 @@ |
| #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" |
| #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
| #include "chrome/common/url_constants.h" |
| +#include "chromeos/audio/chromeos_sounds.h" |
| #include "google_apis/gaia/gaia_auth_util.h" |
| +#include "grit/browser_resources.h" |
| #include "grit/generated_resources.h" |
| #include "net/base/data_url.h" |
| #include "net/base/escape.h" |
| #include "ui/base/l10n/l10n_util.h" |
| +#include "ui/base/resource/resource_bundle.h" |
| const char kJsScreenPath[] = "login.LocallyManagedUserCreationScreen"; |
| @@ -28,6 +32,13 @@ LocallyManagedUserCreationScreenHandler:: |
| LocallyManagedUserCreationScreenHandler() |
| : BaseScreenHandler(kJsScreenPath), |
| delegate_(NULL) { |
| + |
|
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)); |
| } |
| LocallyManagedUserCreationScreenHandler:: |
| @@ -130,6 +141,11 @@ void LocallyManagedUserCreationScreenHandler::DeclareLocalizedValues( |
| 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("photoFlippedAccessibleText", |
| + IDS_OPTIONS_PHOTO_FLIP_ACCESSIBLE_TEXT); |
| + builder->Add("photoFlippedBackAccessibleText", |
| + IDS_OPTIONS_PHOTO_FLIPBACK_ACCESSIBLE_TEXT); |
| + |
| } |
| void LocallyManagedUserCreationScreenHandler::Initialize() {} |
| @@ -172,6 +188,10 @@ void LocallyManagedUserCreationScreenHandler::RegisterMessages() { |
| AddCallback("supervisedUserPhotoTaken", |
| &LocallyManagedUserCreationScreenHandler::HandlePhotoTaken); |
| + AddCallback("supervisedUserPhotoTaken", |
| + &LocallyManagedUserCreationScreenHandler::HandleTakePhoto); |
| + AddCallback("supervisedUserPhotoTaken", |
| + &LocallyManagedUserCreationScreenHandler::HandleDiscardPhoto); |
| AddCallback("supervisedUserSelectImage", |
| &LocallyManagedUserCreationScreenHandler::HandleSelectImage); |
| AddCallback("supervisedUserCheckCameraPresence", |
| @@ -390,6 +410,16 @@ void LocallyManagedUserCreationScreenHandler::HandlePhotoTaken |
| delegate_->OnPhotoTaken(raw_data); |
| } |
| +void LocallyManagedUserCreationScreenHandler::HandleTakePhoto() { |
| + ash::PlaySystemSound(SOUND_CAMERA_SNAP, |
| + true /* honor_spoken_feedback */); |
| +} |
| + |
| +void LocallyManagedUserCreationScreenHandler::HandleDiscardPhoto() { |
| + ash::PlaySystemSound(SOUND_OBJECT_DELETE, |
| + true /* honor_spoken_feedback */); |
| +} |
| + |
| void LocallyManagedUserCreationScreenHandler::HandleCheckCameraPresence() { |
| if (!delegate_) |
| return; |