summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/toolbar_controller.mm
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/cocoa/toolbar_controller.mm
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/cocoa/toolbar_controller.mm')
-rw-r--r--chrome/browser/cocoa/toolbar_controller.mm6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/cocoa/toolbar_controller.mm b/chrome/browser/cocoa/toolbar_controller.mm
index f36dde5..db37585 100644
--- a/chrome/browser/cocoa/toolbar_controller.mm
+++ b/chrome/browser/cocoa/toolbar_controller.mm
@@ -80,7 +80,7 @@ const CGFloat kWrenchMenuLeftPadding = 3.0;
@interface ToolbarController(Private)
- (void)addAccessibilityDescriptions;
- (void)initCommandStatus:(CommandUpdater*)commands;
-- (void)prefChanged:(std::wstring*)prefName;
+- (void)prefChanged:(std::string*)prefName;
- (BackgroundGradientView*)backgroundGradientView;
- (void)toolbarFrameChanged;
- (void)pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:(BOOL)animate;
@@ -166,7 +166,7 @@ class NotificationBridge : public NotificationObserver {
const NotificationSource& source,
const NotificationDetails& details) {
if (type == NotificationType::PREF_CHANGED)
- [controller_ prefChanged:Details<std::wstring>(details).ptr()];
+ [controller_ prefChanged:Details<std::string>(details).ptr()];
else if (type == NotificationType::UPGRADE_RECOMMENDED)
[controller_ badgeWrenchMenu];
}
@@ -583,7 +583,7 @@ class NotificationBridge : public NotificationObserver {
[wrenchMenuController_ insertUpdateAvailableItem];
}
-- (void)prefChanged:(std::wstring*)prefName {
+- (void)prefChanged:(std::string*)prefName {
if (!prefName) return;
if (*prefName == prefs::kShowHomeButton) {
[self showOptionalHomeButton];