summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/browser_toolbar_gtk.cc
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/gtk/browser_toolbar_gtk.cc
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/gtk/browser_toolbar_gtk.cc')
-rw-r--r--chrome/browser/gtk/browser_toolbar_gtk.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc
index 047f48d..a28abed 100644
--- a/chrome/browser/gtk/browser_toolbar_gtk.cc
+++ b/chrome/browser/gtk/browser_toolbar_gtk.cc
@@ -377,7 +377,7 @@ void BrowserToolbarGtk::Observe(NotificationType type,
const NotificationSource& source,
const NotificationDetails& details) {
if (type == NotificationType::PREF_CHANGED) {
- NotifyPrefChanged(Details<std::wstring>(details).ptr());
+ NotifyPrefChanged(Details<std::string>(details).ptr());
} else if (type == NotificationType::BROWSER_THEME_CHANGED) {
// Update the spacing around the menu buttons
bool use_gtk = theme_provider_->UseGtkTheme();
@@ -627,7 +627,7 @@ void BrowserToolbarGtk::OnDragDataReceived(GtkWidget* widget,
home_page_.SetValue(url.spec());
}
-void BrowserToolbarGtk::NotifyPrefChanged(const std::wstring* pref) {
+void BrowserToolbarGtk::NotifyPrefChanged(const std::string* pref) {
if (!pref || *pref == prefs::kShowHomeButton) {
if (show_home_button_.GetValue() && !ShouldOnlyShowLocation()) {
gtk_widget_show(home_->widget());