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

Unified Diff: chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc

Issue 684143003: Make chrome/browser/ui/webui not depend on ash when using Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash43_kiosk_mode
Patch Set: Created 6 years, 2 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
Index: chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
index ce27f8cc34968a1bb2fe692c0f29078c4f64c813..225ac71666c8923f664d6b8fe9a288b5739aae2b 100644
--- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
@@ -4,7 +4,6 @@
#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"
@@ -24,6 +23,10 @@
#include "ui/base/resource/resource_bundle.h"
#include "url/gurl.h"
+#if defined(USE_ASH)
+#include "ash/audio/sounds.h"
+#endif
+
namespace {
const char kJsScreenPath[] = "login.UserImageScreen";
@@ -185,11 +188,15 @@ void UserImageScreenHandler::HandlePhotoTaken(const std::string& image_url) {
}
void UserImageScreenHandler::HandleTakePhoto() {
+#if defined(USE_ASH)
ash::PlaySystemSoundIfSpokenFeedback(SOUND_CAMERA_SNAP);
+#endif
}
void UserImageScreenHandler::HandleDiscardPhoto() {
+#if defined(USE_ASH)
ash::PlaySystemSoundIfSpokenFeedback(SOUND_OBJECT_DELETE);
+#endif
}
void UserImageScreenHandler::HandleSelectImage(const std::string& image_url,

Powered by Google App Engine
This is Rietveld 408576698