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

Side by Side Diff: chrome/browser/chromeos/login/login_display_host_impl.cc

Issue 216173005: Startup sound is put behind the ChromeVox. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/login_display_host_impl.h" 5 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/audio/sounds.h" 9 #include "ash/audio/sounds.h"
10 #include "ash/desktop_background/desktop_background_controller.h" 10 #include "ash/desktop_background/desktop_background_controller.h"
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 auto_enrollment_controller_->RegisterProgressCallback( 476 auto_enrollment_controller_->RegisterProgressCallback(
477 base::Bind(&LoginDisplayHostImpl::OnAutoEnrollmentProgress, 477 base::Bind(&LoginDisplayHostImpl::OnAutoEnrollmentProgress,
478 base::Unretained(this))); 478 base::Unretained(this)));
479 } 479 }
480 return auto_enrollment_controller_.get(); 480 return auto_enrollment_controller_.get();
481 } 481 }
482 482
483 void LoginDisplayHostImpl::StartWizard( 483 void LoginDisplayHostImpl::StartWizard(
484 const std::string& first_screen_name, 484 const std::string& first_screen_name,
485 scoped_ptr<base::DictionaryValue> screen_parameters) { 485 scoped_ptr<base::DictionaryValue> screen_parameters) {
486 startup_sound_honors_spoken_feedback_ = false; 486 startup_sound_honors_spoken_feedback_ = true;
487 TryToPlayStartupSound(); 487 TryToPlayStartupSound();
488 488
489 // Keep parameters to restore if renderer crashes. 489 // Keep parameters to restore if renderer crashes.
490 restore_path_ = RESTORE_WIZARD; 490 restore_path_ = RESTORE_WIZARD;
491 wizard_first_screen_name_ = first_screen_name; 491 wizard_first_screen_name_ = first_screen_name;
492 if (screen_parameters.get()) 492 if (screen_parameters.get())
493 wizard_screen_parameters_.reset(screen_parameters->DeepCopy()); 493 wizard_screen_parameters_.reset(screen_parameters->DeepCopy());
494 else 494 else
495 wizard_screen_parameters_.reset(); 495 wizard_screen_parameters_.reset();
496 is_showing_login_ = false; 496 is_showing_login_ = false;
(...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after
1162 scoped_ptr<locale_util::SwitchLanguageCallback> callback( 1162 scoped_ptr<locale_util::SwitchLanguageCallback> callback(
1163 new locale_util::SwitchLanguageCallback( 1163 new locale_util::SwitchLanguageCallback(
1164 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); 1164 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))));
1165 1165
1166 // Load locale keyboards here. Hardware layout would be automatically enabled. 1166 // Load locale keyboards here. Hardware layout would be automatically enabled.
1167 locale_util::SwitchLanguage( 1167 locale_util::SwitchLanguage(
1168 locale, true, true /* login_layouts_only */, callback.Pass()); 1168 locale, true, true /* login_layouts_only */, callback.Pass());
1169 } 1169 }
1170 1170
1171 } // namespace chromeos 1171 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698