| Index: chrome/browser/chromeos/login/existing_user_controller.cc
|
| diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
|
| index cd4ea04dee5e813245d01d867a59fe7ab4be9ccf..def13ebd4899adb6d002cc9d4adb5421666f2308 100644
|
| --- a/chrome/browser/chromeos/login/existing_user_controller.cc
|
| +++ b/chrome/browser/chromeos/login/existing_user_controller.cc
|
| @@ -21,7 +21,7 @@
|
| #include "base/values.h"
|
| #include "base/version.h"
|
| #include "chrome/browser/browser_process.h"
|
| -#include "chrome/browser/chromeos/accessibility/accessibility_util.h"
|
| +#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
|
| #include "chrome/browser/chromeos/boot_times_loader.h"
|
| #include "chrome/browser/chromeos/cros/cros_library.h"
|
| #include "chrome/browser/chromeos/customization_document.h"
|
| @@ -451,7 +451,7 @@ void ExistingUserController::PerformLogin(
|
| } else {
|
| login_performer_->PerformLogin(user_context, auth_mode);
|
| }
|
| - accessibility::MaybeSpeak(
|
| + AccessibilityManager::Get()->MaybeSpeak(
|
| l10n_util::GetStringUTF8(IDS_CHROMEOS_ACC_LOGIN_SIGNING_IN));
|
| }
|
|
|
| @@ -469,7 +469,7 @@ void ExistingUserController::LoginAsRetailModeUser() {
|
| login_performer_.reset(new LoginPerformer(this));
|
| is_login_in_progress_ = true;
|
| login_performer_->LoginRetailMode();
|
| - accessibility::MaybeSpeak(
|
| + AccessibilityManager::Get()->MaybeSpeak(
|
| l10n_util::GetStringUTF8(IDS_CHROMEOS_ACC_LOGIN_SIGNIN_DEMOUSER));
|
| }
|
|
|
| @@ -522,7 +522,7 @@ void ExistingUserController::LoginAsGuest() {
|
| login_performer_.reset(new LoginPerformer(this));
|
| is_login_in_progress_ = true;
|
| login_performer_->LoginOffTheRecord();
|
| - accessibility::MaybeSpeak(
|
| + AccessibilityManager::Get()->MaybeSpeak(
|
| l10n_util::GetStringUTF8(IDS_CHROMEOS_ACC_LOGIN_SIGNIN_OFFRECORD));
|
| }
|
|
|
| @@ -578,7 +578,7 @@ void ExistingUserController::LoginAsPublicAccount(
|
| login_performer_.reset(new LoginPerformer(this));
|
| is_login_in_progress_ = true;
|
| login_performer_->LoginAsPublicAccount(username);
|
| - accessibility::MaybeSpeak(
|
| + AccessibilityManager::Get()->MaybeSpeak(
|
| l10n_util::GetStringUTF8(IDS_CHROMEOS_ACC_LOGIN_SIGNIN_PUBLIC_ACCOUNT));
|
| }
|
|
|
| @@ -974,7 +974,6 @@ gfx::NativeWindow ExistingUserController::GetNativeWindow() const {
|
| void ExistingUserController::InitializeStartUrls() const {
|
| std::vector<std::string> start_urls;
|
|
|
| - PrefService* prefs = g_browser_process->local_state();
|
| const base::ListValue *urls;
|
| bool show_getstarted_guide = false;
|
| if (UserManager::Get()->IsLoggedInAsDemoUser()) {
|
| @@ -990,8 +989,9 @@ void ExistingUserController::InitializeStartUrls() const {
|
| }
|
| // Skip the default first-run behavior for public accounts.
|
| } else if (!UserManager::Get()->IsLoggedInAsPublicAccount()) {
|
| - if (prefs->GetBoolean(prefs::kSpokenFeedbackEnabled)) {
|
| + if (AccessibilityManager::Get()->IsSpokenFeedbackEnabled()) {
|
| const char* url = kChromeVoxTutorialURLPattern;
|
| + PrefService* prefs = g_browser_process->local_state();
|
| const std::string current_locale =
|
| StringToLowerASCII(prefs->GetString(prefs::kApplicationLocale));
|
| std::string vox_url = base::StringPrintf(url, current_locale.c_str());
|
|
|