Add language_prefs namespace to language_preferences.h.

chrome/browser/chromeos/options/system_page_view.cc

 // Copyright (c) 2010 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/chromeos/options/system_page_view.h"
 
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
@@ skipping 385 matching lines @@
   IntegerPrefMember xkb_auto_repeat_interval_pref_;
   views::Slider* xkb_auto_repeat_interval_slider_;
 
   DISALLOW_COPY_AND_ASSIGN(LanguageSection);
 };
 
 LanguageSection::LanguageSection(Profile* profile)
     : SettingsPageSection(profile,
                           IDS_OPTIONS_SETTINGS_SECTION_TITLE_LANGUAGE),
       xkb_modifier_combobox_(NULL),
-      xkb_modifier_combobox_model_(&kXkbModifierMultipleChoicePrefs),
+      xkb_modifier_combobox_model_(
+          &language_prefs::kXkbModifierMultipleChoicePrefs),
       xkb_auto_repeat_delay_slider_(NULL),
       xkb_auto_repeat_interval_slider_(NULL) {
   xkb_remap_search_key_pref_.Init(
       prefs::kLanguageXkbRemapSearchKeyTo, profile->GetPrefs(), this);
   xkb_remap_control_key_pref_.Init(
       prefs::kLanguageXkbRemapControlKeyTo, profile->GetPrefs(), this);
   xkb_remap_alt_key_pref_.Init(
       prefs::kLanguageXkbRemapAltKeyTo, profile->GetPrefs(), this);
   xkb_auto_repeat_pref_.Init(
       prefs::kLanguageXkbAutoRepeatEnabled, profile->GetPrefs(), this);
   xkb_auto_repeat_delay_pref_.Init(
-      kXkbAutoRepeatDelayPref.pref_name, profile->GetPrefs(), this);
+      language_prefs::kXkbAutoRepeatDelayPref.pref_name,
+      profile->GetPrefs(), this);
   xkb_auto_repeat_interval_pref_.Init(
-      kXkbAutoRepeatIntervalPref.pref_name, profile->GetPrefs(), this);
+      language_prefs::kXkbAutoRepeatIntervalPref.pref_name,
+      profile->GetPrefs(), this);
 }
 
 void LanguageSection::InitContents(GridLayout* layout) {
   // Add the customize button and XKB combobox.
   layout->StartRow(0, double_column_view_set_id());
   views::NativeButton* customize_languages_button = new views::NativeButton(
       this,
       l10n_util::GetString(IDS_OPTIONS_SETTINGS_LANGUAGES_CUSTOMIZE));
   customize_languages_button->set_tag(kCustomizeLanguagesButton);
 
   xkb_modifier_combobox_ = new views::Combobox(&xkb_modifier_combobox_model_);
   xkb_modifier_combobox_->set_listener(this);
 
   xkb_auto_repeat_checkbox_ = new views::Checkbox(l10n_util::GetString(
       IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_REPEAT_ENABLED));
   xkb_auto_repeat_checkbox_->set_tag(kEnableAutoRepeatButton);
   xkb_auto_repeat_checkbox_->set_listener(this);
 
   xkb_auto_repeat_delay_slider_ = new views::Slider(
-      kXkbAutoRepeatDelayPref.min_pref_value,
-      kXkbAutoRepeatDelayPref.max_pref_value,
+      language_prefs::kXkbAutoRepeatDelayPref.min_pref_value,
+      language_prefs::kXkbAutoRepeatDelayPref.max_pref_value,
       1,
       static_cast<views::Slider::StyleFlags>(
           views::Slider::STYLE_UPDATE_ON_RELEASE),
       this);
   xkb_auto_repeat_interval_slider_ = new views::Slider(
-      kXkbAutoRepeatIntervalPref.min_pref_value,
-      kXkbAutoRepeatIntervalPref.max_pref_value,
+      language_prefs::kXkbAutoRepeatIntervalPref.min_pref_value,
+      language_prefs::kXkbAutoRepeatIntervalPref.max_pref_value,
       1,
       static_cast<views::Slider::StyleFlags>(
           views::Slider::STYLE_UPDATE_ON_RELEASE),
       this);
 
   // Initialize the combobox to what's saved in user preferences. Otherwise,
   // ItemChanged() will be called with |new_index| == 0.
   NotifyPrefChanged(NULL);
 
   layout->AddView(customize_languages_button, 1, 1,
                   GridLayout::LEADING, GridLayout::CENTER);
   layout->AddView(xkb_modifier_combobox_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id());
   layout->AddView(xkb_auto_repeat_checkbox_);
 
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, quad_column_view_set_id());
   layout->AddView(new views::Label(
-      l10n_util::GetString(kXkbAutoRepeatDelayPref.message_id)),
+      l10n_util::GetString(
+          language_prefs::kXkbAutoRepeatDelayPref.message_id)),
                   1, 1, GridLayout::LEADING, GridLayout::CENTER);
   layout->AddView(new views::Label(
       l10n_util::GetString(
           IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_REPEAT_DELAY_SHORT)));
   layout->AddView(xkb_auto_repeat_delay_slider_);
   layout->AddView(new views::Label(
       l10n_util::GetString(
           IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_REPEAT_DELAY_LONG)));
 
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, quad_column_view_set_id());
   layout->AddView(new views::Label(
-      l10n_util::GetString(kXkbAutoRepeatIntervalPref.message_id)),
+      l10n_util::GetString(
+          language_prefs::kXkbAutoRepeatIntervalPref.message_id)),
                   1, 1, GridLayout::LEADING, GridLayout::CENTER);
   layout->AddView(new views::Label(
       l10n_util::GetString(
           IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_REPEAT_SPEED_FAST)));
   layout->AddView(xkb_auto_repeat_interval_slider_);
   layout->AddView(new views::Label(
       l10n_util::GetString(
           IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_REPEAT_SPEED_SLOW)));
 
   layout->AddPaddingRow(0, kUnrelatedControlVerticalSpacing);
@@ skipping 10 matching lines @@
 }
 
 void LanguageSection::ItemChanged(views::Combobox* sender,
                                   int prev_index,
                                   int new_index) {
   LOG(INFO) << "Changing XKB modofier pref to " << new_index;
   switch (new_index) {
     default:
       LOG(ERROR) << "Unexpected mapping: " << new_index;
       /* fall through */
-    case kNoRemap:
+    case language_prefs::kNoRemap:
       xkb_remap_search_key_pref_.SetValue(kSearchKey);
       xkb_remap_control_key_pref_.SetValue(kLeftControlKey);
       xkb_remap_alt_key_pref_.SetValue(kLeftAltKey);
       break;
-    case kSwapCtrlAndAlt:
+    case language_prefs::kSwapCtrlAndAlt:
       xkb_remap_search_key_pref_.SetValue(kSearchKey);
       xkb_remap_control_key_pref_.SetValue(kLeftAltKey);
       xkb_remap_alt_key_pref_.SetValue(kLeftControlKey);
       break;
-    case kSwapSearchAndCtrl:
+    case language_prefs::kSwapSearchAndCtrl:
       xkb_remap_search_key_pref_.SetValue(kLeftControlKey);
       xkb_remap_control_key_pref_.SetValue(kSearchKey);
       xkb_remap_alt_key_pref_.SetValue(kLeftAltKey);
       break;
   }
 }
 
 void LanguageSection::SliderValueChanged(views::Slider* sender) {
   if (xkb_auto_repeat_delay_slider_ == sender) {
     xkb_auto_repeat_delay_pref_.SetValue(sender->value());
   } else if (xkb_auto_repeat_interval_slider_ == sender) {
     xkb_auto_repeat_interval_pref_.SetValue(sender->value());
   }
 }
 
 void LanguageSection::NotifyPrefChanged(const std::string* pref_name) {
   if (!pref_name || (*pref_name == prefs::kLanguageXkbRemapSearchKeyTo ||
                      *pref_name == prefs::kLanguageXkbRemapControlKeyTo ||
                      *pref_name == prefs::kLanguageXkbRemapAltKeyTo)) {
     const int search_remap = xkb_remap_search_key_pref_.GetValue();
     const int control_remap = xkb_remap_control_key_pref_.GetValue();
     const int alt_remap = xkb_remap_alt_key_pref_.GetValue();
     if ((search_remap == kSearchKey) &&
         (control_remap == kLeftControlKey) &&
         (alt_remap == kLeftAltKey)) {
-      xkb_modifier_combobox_->SetSelectedItem(kNoRemap);
+      xkb_modifier_combobox_->SetSelectedItem(language_prefs::kNoRemap);
     } else if ((search_remap == kLeftControlKey) &&
                (control_remap == kSearchKey) &&
                (alt_remap == kLeftAltKey)) {
-      xkb_modifier_combobox_->SetSelectedItem(kSwapSearchAndCtrl);
+      xkb_modifier_combobox_->SetSelectedItem(
+          language_prefs::kSwapSearchAndCtrl);
     } else if ((search_remap == kSearchKey) &&
                (control_remap == kLeftAltKey) &&
                (alt_remap == kLeftControlKey)) {
-      xkb_modifier_combobox_->SetSelectedItem(kSwapCtrlAndAlt);
+      xkb_modifier_combobox_->SetSelectedItem(language_prefs::kSwapCtrlAndAlt);
     } else {
       LOG(ERROR) << "Unexpected mapping. The prefs are updated by DOMUI?";
-      xkb_modifier_combobox_->SetSelectedItem(kNoRemap);
+      xkb_modifier_combobox_->SetSelectedItem(language_prefs::kNoRemap);
     }
   }
   if (!pref_name || *pref_name == prefs::kLanguageXkbAutoRepeatEnabled) {
     const bool enabled = xkb_auto_repeat_pref_.GetValue();
     xkb_auto_repeat_checkbox_->SetChecked(enabled);
   }
-  if (!pref_name || *pref_name == kXkbAutoRepeatDelayPref.pref_name) {
+  if (!pref_name ||
+      *pref_name == language_prefs::kXkbAutoRepeatDelayPref.pref_name) {
     const int delay_value = xkb_auto_repeat_delay_pref_.GetValue();
     xkb_auto_repeat_delay_slider_->SetValue(delay_value);
   }
-  if (!pref_name || *pref_name == kXkbAutoRepeatIntervalPref.pref_name) {
+  if (!pref_name ||
+      *pref_name == language_prefs::kXkbAutoRepeatIntervalPref.pref_name) {
     const int interval_value = xkb_auto_repeat_interval_pref_.GetValue();
     xkb_auto_repeat_interval_slider_->SetValue(interval_value);
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // AccessibilitySection
 
 // Checkbox for specifying if accessibility should be enabled for this profile
 class AccessibilitySection : public SettingsPageSection,
@@ skipping 84 matching lines @@
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(new LanguageSection(profile()));
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(new AccessibilitySection(profile()));
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 }
 
 }  // namespace chromeos