summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/options
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-11 03:02:51 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-11 03:02:51 +0000
commit57ecc4bf4069cb869e5fb0a7d922eec2384bac25 (patch)
tree1b4668fa59d6b6a072144b4ddab8d5f6faba3fa4 /chrome/browser/chromeos/options
parent1af19cfd7b1ef9924516dbe811db495315feaefe (diff)
downloadchromium_src-57ecc4bf4069cb869e5fb0a7d922eec2384bac25.zip
chromium_src-57ecc4bf4069cb869e5fb0a7d922eec2384bac25.tar.gz
chromium_src-57ecc4bf4069cb869e5fb0a7d922eec2384bac25.tar.bz2
Make prefs use std::string for keys rather than wstrings.
Much remains to be converted. BUG=23581 TEST=builds and passes tests Review URL: http://codereview.chromium.org/3076037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55660 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/options')
-rw-r--r--chrome/browser/chromeos/options/system_page_view.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/chromeos/options/system_page_view.cc b/chrome/browser/chromeos/options/system_page_view.cc
index de6e4b8..416a474 100644
--- a/chrome/browser/chromeos/options/system_page_view.cc
+++ b/chrome/browser/chromeos/options/system_page_view.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
@@ -214,7 +214,7 @@ class TouchpadSection : public SettingsPageSection,
protected:
// SettingsPageSection overrides:
virtual void InitContents(GridLayout* layout);
- virtual void NotifyPrefChanged(const std::wstring* pref_name);
+ virtual void NotifyPrefChanged(const std::string* pref_name);
private:
// The View that contains the contents of the section.
@@ -328,7 +328,7 @@ void TouchpadSection::InitContents(GridLayout* layout) {
profile()->GetPrefs(), this);
}
-void TouchpadSection::NotifyPrefChanged(const std::wstring* pref_name) {
+void TouchpadSection::NotifyPrefChanged(const std::string* pref_name) {
if (!pref_name || *pref_name == prefs::kTapToClickEnabled) {
bool enabled = tap_to_click_enabled_.GetValue();
enable_tap_to_click_checkbox_->SetChecked(enabled);
@@ -364,7 +364,7 @@ class LanguageSection : public SettingsPageSection,
};
// Overridden from SettingsPageSection:
virtual void InitContents(GridLayout* layout);
- void NotifyPrefChanged(const std::wstring* pref_name);
+ void NotifyPrefChanged(const std::string* pref_name);
// Overridden from views::ButtonListener:
virtual void ButtonPressed(views::Button* sender,
@@ -424,7 +424,7 @@ void LanguageSection::ItemChanged(views::Combobox* sender,
xkb_pref_.SetValue(new_index);
}
-void LanguageSection::NotifyPrefChanged(const std::wstring* pref_name) {
+void LanguageSection::NotifyPrefChanged(const std::string* pref_name) {
if (!pref_name || *pref_name == prefs::kLanguageXkbModifierRemap) {
const int id = xkb_pref_.GetValue();
if (id >= 0) {
@@ -450,7 +450,7 @@ class AccessibilitySection : public SettingsPageSection,
// Overridden from SettingsPageSection:
virtual void InitContents(GridLayout* layout);
- virtual void NotifyPrefChanged(const std::wstring* pref_name);
+ virtual void NotifyPrefChanged(const std::string* pref_name);
private:
// The View that contains the contents of the section.
@@ -495,7 +495,7 @@ void AccessibilitySection::ButtonPressed(
}
}
-void AccessibilitySection::NotifyPrefChanged(const std::wstring* pref_name) {
+void AccessibilitySection::NotifyPrefChanged(const std::string* pref_name) {
if (!pref_name || *pref_name == prefs::kAccessibilityEnabled) {
bool enabled = accessibility_enabled_.GetValue();
accessibility_checkbox_->SetChecked(enabled);