Rename prefs::kAccessibilityEnabled to kSpokenFeedbackEnabled

Rename the name to describe its role more precisely
Actual value ("settings.accessibility") is not changed

BUG=None
TEST=build success


Review URL: http://codereview.chromium.org/8800033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113545 0039d316-1c4b-4281-b951-d872f2087c98

12 files changed, 20 insertions, 20 deletions

diff --git a/chrome/browser/chromeos/accessibility/accessibility_util.cc b/chrome/browser/chromeos/accessibility/accessibility_util.cc
index 5a04e6d..27f08ea 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_util.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_util.cc
@@ -86,7 +86,7 @@ class ContentScriptLoader {
 void EnableAccessibility(bool enabled, WebUI* login_web_ui) {
   bool accessibility_enabled = g_browser_process &&
       g_browser_process->local_state()->GetBoolean(
-          prefs::kAccessibilityEnabled);
+          prefs::kSpokenFeedbackEnabled);
   if (accessibility_enabled == enabled) {
     LOG(INFO) << "Accessibility is already " <<
         (enabled ? "enabled" : "disabled") << ".  Going to do nothing.";
@@ -94,7 +94,7 @@ void EnableAccessibility(bool enabled, WebUI* login_web_ui) {
   }
 
   g_browser_process->local_state()->SetBoolean(
-      prefs::kAccessibilityEnabled, enabled);
+      prefs::kSpokenFeedbackEnabled, enabled);
   g_browser_process->local_state()->ScheduleSavePersistentPrefs();
   ExtensionAccessibilityEventRouter::GetInstance()->
       SetAccessibilityEnabled(enabled);
@@ -143,7 +143,7 @@ void EnableAccessibility(bool enabled, WebUI* login_web_ui) {
 void ToggleAccessibility(WebUI* login_web_ui) {
   bool accessibility_enabled = g_browser_process &&
       g_browser_process->local_state()->GetBoolean(
-          prefs::kAccessibilityEnabled);
+          prefs::kSpokenFeedbackEnabled);
   accessibility_enabled = !accessibility_enabled;
   EnableAccessibility(accessibility_enabled, login_web_ui);
 };
@@ -163,7 +163,7 @@ bool IsAccessibilityEnabled() {
   }
   PrefService* prefs = g_browser_process->local_state();
   bool accessibility_enabled = prefs &&
-      prefs->GetBoolean(prefs::kAccessibilityEnabled);
+      prefs->GetBoolean(prefs::kSpokenFeedbackEnabled);
   return accessibility_enabled;
 }
 
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index d4476dc..f55b1a4 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -424,7 +424,7 @@ void ExistingUserController::OnProfilePrepared(Profile* profile) {
     const std::string current_locale =
         StringToLowerASCII(prefs->GetString(prefs::kApplicationLocale));
     std::string start_url;
-    if (prefs->GetBoolean(prefs::kAccessibilityEnabled) &&
+    if (prefs->GetBoolean(prefs::kSpokenFeedbackEnabled) &&
         current_locale.find("en") != std::string::npos) {
       start_url = kChromeVoxTutorialURL;
     } else {
diff --git a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc
index e5c9dc2..3310d26 100644
--- a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc
+++ b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc
@@ -81,7 +81,7 @@ void WizardAccessibilityHelper::UnregisterNotifications() {
 bool WizardAccessibilityHelper::IsAccessibilityEnabled() {
   return g_browser_process &&
       g_browser_process->local_state()->GetBoolean(
-      prefs::kAccessibilityEnabled);
+      prefs::kSpokenFeedbackEnabled);
 }
 
 void WizardAccessibilityHelper::MaybeSpeak(const char* str, bool queue,
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 0fc3e90..cdf3bcd 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -334,8 +334,8 @@ void WizardController::RegisterPrefs(PrefService* local_state) {
                                   PrefService::UNSYNCABLE_PREF);
   // Check if the pref is already registered in case
   // Preferences::RegisterUserPrefs runs before this code in the future.
-  if (local_state->FindPreference(prefs::kAccessibilityEnabled) == NULL) {
-    local_state->RegisterBooleanPref(prefs::kAccessibilityEnabled,
+  if (local_state->FindPreference(prefs::kSpokenFeedbackEnabled) == NULL) {
+    local_state->RegisterBooleanPref(prefs::kSpokenFeedbackEnabled,
                                      false,
                                      PrefService::UNSYNCABLE_PREF);
   }
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index 2cfd84e..6be339a 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -53,8 +53,8 @@ void Preferences::RegisterUserPrefs(PrefService* prefs) {
   // Check if the accessibility pref is already registered, which can happen
   // in WizardController::RegisterPrefs. We still want to try to register
   // the pref here in case of Chrome/Linux with ChromeOS=1.
-  if (prefs->FindPreference(prefs::kAccessibilityEnabled) == NULL) {
-    prefs->RegisterBooleanPref(prefs::kAccessibilityEnabled,
+  if (prefs->FindPreference(prefs::kSpokenFeedbackEnabled) == NULL) {
+    prefs->RegisterBooleanPref(prefs::kSpokenFeedbackEnabled,
                                false,
                                PrefService::UNSYNCABLE_PREF);
   }
@@ -205,7 +205,7 @@ void Preferences::RegisterUserPrefs(PrefService* prefs) {
 
 void Preferences::Init(PrefService* prefs) {
   tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, this);
-  accessibility_enabled_.Init(prefs::kAccessibilityEnabled, prefs, this);
+  accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled, prefs, this);
   sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, this);
   use_24hour_clock_.Init(prefs::kUse24HourClock, prefs, this);
   language_hotkey_next_engine_in_menu_.Init(
diff --git a/chrome/browser/chromeos/status/accessibility_menu_button.cc b/chrome/browser/chromeos/status/accessibility_menu_button.cc
index 85fa4b2..ff4f176 100644
--- a/chrome/browser/chromeos/status/accessibility_menu_button.cc
+++ b/chrome/browser/chromeos/status/accessibility_menu_button.cc
@@ -41,7 +41,7 @@ AccessibilityMenuButton::AccessibilityMenuButton(
     StatusAreaButton::Delegate* delegate)
     : StatusAreaButton(delegate, this) {
   set_id(VIEW_ID_STATUS_BUTTON_ACCESSIBILITY);
-  accessibility_enabled_.Init(prefs::kAccessibilityEnabled,
+  accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled,
                               g_browser_process->local_state(), this);
   SetIcon(*ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_STATUSBAR_ACCESSIBILITY));
@@ -92,7 +92,7 @@ void AccessibilityMenuButton::Observe(
     const std::string path =
         *static_cast<content::Details<std::string> >(details).ptr();
     // Show a bubble when accessibility is turned on at the login screen.
-    if (path == prefs::kAccessibilityEnabled) {
+    if (path == prefs::kSpokenFeedbackEnabled) {
       if (accessibility_enabled_.GetValue() &&
           StatusAreaViewChromeos::IsLoginMode()) {
         views::ImageView* icon_view = new views::ImageView;
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 60a73aa..0b8a3df 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -253,7 +253,7 @@ void ComponentLoader::AddDefaultComponentExtensions() {
 
 #if defined(OS_CHROMEOS)
   // Register access extensions only if accessibility is enabled.
-  if (local_state_->GetBoolean(prefs::kAccessibilityEnabled)) {
+  if (local_state_->GetBoolean(prefs::kSpokenFeedbackEnabled)) {
     FilePath path = FilePath(extension_misc::kAccessExtensionPath)
         .AppendASCII(extension_misc::kChromeVoxDirectoryName);
     Add(IDR_CHROMEVOX_MANIFEST, path);
diff --git a/chrome/browser/extensions/component_loader_unittest.cc b/chrome/browser/extensions/component_loader_unittest.cc
index 89f4762..69b5790 100644
--- a/chrome/browser/extensions/component_loader_unittest.cc
+++ b/chrome/browser/extensions/component_loader_unittest.cc
@@ -89,7 +89,7 @@ class ComponentLoaderTest : public testing::Test {
 
     // Register the local state prefs.
 #if defined(OS_CHROMEOS)
-    prefs_.RegisterBooleanPref(prefs::kAccessibilityEnabled, false);
+    prefs_.RegisterBooleanPref(prefs::kSpokenFeedbackEnabled, false);
 #endif
   }
 
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 3608fa1..08f28db 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -482,7 +482,7 @@ bool BrowserView::AcceleratorPressed(const ui::Accelerator& accelerator) {
   // functionality.
   if (accelerator.key_code() == ui::VKEY_LWIN &&
       g_browser_process->local_state()->GetBoolean(
-          prefs::kAccessibilityEnabled)) {
+          prefs::kSpokenFeedbackEnabled)) {
     ExtensionTtsController::GetInstance()->Stop();
     return false;
   }
diff --git a/chrome/browser/ui/webui/options/chromeos/system_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/system_options_handler.cc
index f6eca58..f22c2cf 100644
--- a/chrome/browser/ui/webui/options/chromeos/system_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/system_options_handler.cc
@@ -115,7 +115,7 @@ void SystemOptionsHandler::GetLocalizedValues(
 void SystemOptionsHandler::Initialize() {
   DCHECK(web_ui_);
   PrefService* pref_service = g_browser_process->local_state();
-  bool acc_enabled = pref_service->GetBoolean(prefs::kAccessibilityEnabled);
+  bool acc_enabled = pref_service->GetBoolean(prefs::kSpokenFeedbackEnabled);
   base::FundamentalValue checked(acc_enabled);
   web_ui_->CallJavascriptFunction(
       "options.SystemOptions.SetAccessibilityCheckboxState", checked);
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 90b56fd..22105f3 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -577,8 +577,8 @@ const char kLanguageXkbAutoRepeatInterval[] =
 const char kLanguagePreferredVirtualKeyboard[] =
     "settings.language.preferred_virtual_keyboard";
 
-// A boolean pref which determines whether accessibility is enabled.
-const char kAccessibilityEnabled[] = "settings.accessibility";
+// A boolean pref which determines whether spoken feedback is enabled.
+const char kSpokenFeedbackEnabled[] = "settings.accessibility";
 
 // A boolean pref which turns on Advanced Filesystem
 // (USB support, SD card, etc).
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 34af347..4a54f05 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -207,7 +207,7 @@ extern const char kLanguageXkbAutoRepeatEnabled[];
 extern const char kLanguageXkbAutoRepeatDelay[];
 extern const char kLanguageXkbAutoRepeatInterval[];
 extern const char kLanguagePreferredVirtualKeyboard[];
-extern const char kAccessibilityEnabled[];
+extern const char kSpokenFeedbackEnabled[];
 extern const char kLabsAdvancedFilesystemEnabled[];
 extern const char kLabsMediaplayerEnabled[];
 extern const char kEnableScreenLock[];