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

Unified Diff: chrome/browser/chromeos/login/login_display_host_impl.h

Issue 98583004: Added CrOS startup sound. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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/chromeos/login/login_display_host_impl.h
diff --git a/chrome/browser/chromeos/login/login_display_host_impl.h b/chrome/browser/chromeos/login/login_display_host_impl.h
index c01f14fe888febe268d6d333aa6f1e73f5c76e2e..765314eef326b2e59c70b2783e0218bc9a34029e 100644
--- a/chrome/browser/chromeos/login/login_display_host_impl.h
+++ b/chrome/browser/chromeos/login/login_display_host_impl.h
@@ -18,6 +18,7 @@
#include "chrome/browser/chromeos/login/login_display_host.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
+#include "chromeos/audio/cras_audio_handler.h"
#include "chromeos/dbus/session_manager_client.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
@@ -43,7 +44,8 @@ class WebUILoginView;
class LoginDisplayHostImpl : public LoginDisplayHost,
public content::NotificationObserver,
public content::WebContentsObserver,
- public chromeos::SessionManagerClient::Observer {
+ public chromeos::SessionManagerClient::Observer,
+ public chromeos::CrasAudioHandler::AudioObserver {
public:
explicit LoginDisplayHostImpl(const gfx::Rect& background_bounds);
virtual ~LoginDisplayHostImpl();
@@ -108,6 +110,9 @@ class LoginDisplayHostImpl : public LoginDisplayHost,
// Overridden from chromeos::SessionManagerClient::Observer:
virtual void EmitLoginPromptVisibleCalled() OVERRIDE;
+ // Overridden from chromeos::CrasAudioHandler::AudioObserver:
+ virtual void OnActiveOutputNodeChanged() OVERRIDE;
+
private:
// Way to restore if renderer have crashed.
enum RestorePath {
@@ -172,9 +177,8 @@ class LoginDisplayHostImpl : public LoginDisplayHost,
// Tries to play startup sound. If sound can't be played right now,
// for instance, because cras server is not initialized, playback
- // will be delayed. When |honor_spoken_feedback| is true, sound will
- // be reproduced iff spoken feedback is enabled.
- void TryToPlayStartupSound(bool honor_spoken_feedback);
+ // will be delayed.
+ void TryToPlayStartupSound();
// Called when login-prompt-visible signal is caught.
void OnLoginPromptVisible();
@@ -293,9 +297,6 @@ class LoginDisplayHostImpl : public LoginDisplayHost,
// calculations of delay before startup sound.
base::TimeTicks login_prompt_visible_time_;
- // True when startup sound is requested.
- bool startup_sound_requested_;
-
// True when request to play startup sound was sent to
// SoundsManager.
bool startup_sound_played_;

Powered by Google App Engine
This is Rietveld 408576698