Make chrome/browser/ui/webui not depend on ash when using Athena

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/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/ui/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 "chrome/grit/generated_resources.h"
 #include "chromeos/audio/chromeos_sounds.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_image/default_user_images.h"
 #include "grit/browser_resources.h"
+#include "media/audio/sounds/sounds_manager.h"

[pkotwicz, 2014/10/31 20:44:39]

Previously, we were relying on ash/audio/sounds.h to include this file for us

 #include "net/base/data_url.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "url/gurl.h"
 
+#if !defined(USE_ATHENA)
+#include "ash/audio/sounds.h"
+#endif
+
 namespace {
 
 const char kJsScreenPath[] = "login.UserImageScreen";
 
 }  // namespace
 
 namespace chromeos {
 
 UserImageScreenHandler::UserImageScreenHandler()
     : BaseScreenHandler(kJsScreenPath),
@@ skipping 141 matching lines @@
   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() {
+#if !defined(USE_ATHENA)
   ash::PlaySystemSoundIfSpokenFeedback(SOUND_CAMERA_SNAP);
+#endif
 }
 
 void UserImageScreenHandler::HandleDiscardPhoto() {
+#if !defined(USE_ATHENA)
   ash::PlaySystemSoundIfSpokenFeedback(SOUND_OBJECT_DELETE);
+#endif
 }
 
 void UserImageScreenHandler::HandleSelectImage(const std::string& image_url,
                                                const std::string& image_type,
                                                bool is_user_selection) {
   if (screen_)
     screen_->OnImageSelected(image_type, image_url, is_user_selection);
 }
 
 void UserImageScreenHandler::HandleImageAccepted() {
@@ skipping 11 matching lines @@
 
 void UserImageScreenHandler::SetCameraPresent(bool present) {
   CallJS("setCameraPresent", present);
 }
 
 void UserImageScreenHandler::HideCurtain() {
   CallJS("hideCurtain");
 }
 
 }  // namespace chromeos