diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-01 00:36:10 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-01 00:36:10 +0000 |
commit | 4c4988d34da6e44b5bb7ae11a000a4c324986c8a (patch) | |
tree | 6d0eeea9b1298ab61b6ab3d078e8587c766b37d5 /chrome/browser/notifications/desktop_notification_service.h | |
parent | 8098d41c3e482b7ae94ad37a9a0155a9536383e1 (diff) | |
download | chromium_src-4c4988d34da6e44b5bb7ae11a000a4c324986c8a.zip chromium_src-4c4988d34da6e44b5bb7ae11a000a4c324986c8a.tar.gz chromium_src-4c4988d34da6e44b5bb7ae11a000a4c324986c8a.tar.bz2 |
notifications: Convert some std::wstring over to string16.
BUG=43899
TEST=compiles, trybots.
Signed-off-by: Thiago Farina <tfarina@chromium.org>
Review URL: http://codereview.chromium.org/3010028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54484 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications/desktop_notification_service.h')
-rw-r--r-- | chrome/browser/notifications/desktop_notification_service.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/notifications/desktop_notification_service.h b/chrome/browser/notifications/desktop_notification_service.h index 0b808c8..77198b8 100644 --- a/chrome/browser/notifications/desktop_notification_service.h +++ b/chrome/browser/notifications/desktop_notification_service.h @@ -102,6 +102,7 @@ class DesktopNotificationService : public NotificationObserver { void ResetAllOrigins(); static void RegisterUserPrefs(PrefService* user_prefs); + private: void InitPrefs(); void StartObserving(); @@ -116,7 +117,7 @@ class DesktopNotificationService : public NotificationObserver { // Returns a display name for an origin, to be used in permission infobar // or on the frame of the notification toast. Different from the origin // itself when dealing with extensions. - std::wstring DisplayNameForOrigin(const GURL& origin); + string16 DisplayNameForOrigin(const GURL& origin); ContentSetting GetContentSetting(const GURL& origin); |