Remove unused language options code, which has been superseded by DOMUI.

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"
 #include "base/stl_util-inl.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/keyboard_library.h"
 #include "chrome/browser/chromeos/cros/system_library.h"
 #include "chrome/browser/chromeos/language_preferences.h"
-#include "chrome/browser/chromeos/options/language_config_util.h"
-#include "chrome/browser/chromeos/options/language_config_view.h"
 #include "chrome/browser/chromeos/options/options_window_view.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 #include "ui/base/models/combobox_model.h"
 #include "unicode/timezone.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/combobox/combobox.h"
@@ skipping 265 matching lines @@
   if (!pref_name || *pref_name == prefs::kTapToClickEnabled) {
     bool enabled =  tap_to_click_enabled_.GetValue();
     enable_tap_to_click_checkbox_->SetChecked(enabled);
   }
   if (!pref_name || *pref_name == prefs::kTouchpadSensitivity) {
     double value =  sensitivity_.GetValue();
     sensitivity_slider_->SetValue(value);
   }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// LanguageSection
-
-// TextInput section for text input settings.
-class LanguageSection : public SettingsPageSection,
-                        public views::ButtonListener,
-                        public views::Combobox::Listener {
- public:
-  explicit LanguageSection(Profile* profile);
-  virtual ~LanguageSection() {}
-
- private:
-  enum ButtonTag {
-    kCustomizeLanguagesButton,
-  };
-  // Overridden from SettingsPageSection:
-  virtual void InitContents(GridLayout* layout);
-  void NotifyPrefChanged(const std::string* pref_name);
-
-  // Overridden from views::ButtonListener:
-  virtual void ButtonPressed(views::Button* sender,
-                             const views::Event& event);
-
-  // Overridden from views::Combobox::Listener:
-  virtual void ItemChanged(views::Combobox* sender,
-                           int prev_index,
-                           int new_index);
-
-  IntegerPrefMember xkb_remap_search_key_pref_;
-  IntegerPrefMember xkb_remap_control_key_pref_;
-  IntegerPrefMember xkb_remap_alt_key_pref_;
-  views::Combobox* xkb_modifier_combobox_;
-  chromeos::LanguageComboboxModel<int> xkb_modifier_combobox_model_;
-
-  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_(
-          &language_prefs::kXkbModifierMultipleChoicePrefs) {
-  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);
-}
-
-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,
-      UTF16ToWide(l10n_util::GetStringUTF16(
-          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);
-
-  // 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, kUnrelatedControlVerticalSpacing);
-}
-
-void LanguageSection::ButtonPressed(
-    views::Button* sender, const views::Event& event) {
-  if (sender->tag() == kCustomizeLanguagesButton) {
-    LanguageConfigView::Show(profile(), GetOptionsViewParent());
-  }
-}
-
-void LanguageSection::ItemChanged(views::Combobox* sender,
-                                  int prev_index,
-                                  int new_index) {
-  VLOG(1) << "Changing XKB modofier pref to " << new_index;
-  switch (new_index) {
-    default:
-      LOG(ERROR) << "Unexpected mapping: " << new_index;
-      /* fall through */
-    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 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 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::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(language_prefs::kNoRemap);
-    } else if ((search_remap == kLeftControlKey) &&
-               (control_remap == kSearchKey) &&
-               (alt_remap == kLeftAltKey)) {
-      xkb_modifier_combobox_->SetSelectedItem(
-          language_prefs::kSwapSearchAndCtrl);
-    } else if ((search_remap == kSearchKey) &&
-               (control_remap == kLeftAltKey) &&
-               (alt_remap == kLeftControlKey)) {
-      xkb_modifier_combobox_->SetSelectedItem(language_prefs::kSwapCtrlAndAlt);
-    } else {
-      LOG(ERROR) << "Unexpected mapping. The prefs are updated by DOMUI?";
-      xkb_modifier_combobox_->SetSelectedItem(language_prefs::kNoRemap);
-    }
-  }
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // AccessibilitySection
 
 // Checkbox for specifying if accessibility should be enabled for this profile
 class AccessibilitySection : public SettingsPageSection,
                              public views::ButtonListener {
  public:
   explicit AccessibilitySection(Profile* profile);
   virtual ~AccessibilitySection() {}
 
@@ skipping 72 matching lines @@
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(new DateTimeSection(profile()));
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(new TouchpadSection(profile()));
   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