summaryrefslogtreecommitdiffstats
path: root/chrome/browser/notifications/notification.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-11 19:14:40 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-11 19:14:40 +0000
commita04db824d215692e471a1c21f8b8422eebdb3223 (patch)
tree5535c4b74b85444774b4bcd33e72be406543da88 /chrome/browser/notifications/notification.cc
parentcd7964025d2a2b9dc285bc52020ab907c7950f6a (diff)
downloadchromium_src-a04db824d215692e471a1c21f8b8422eebdb3223.zip
chromium_src-a04db824d215692e471a1c21f8b8422eebdb3223.tar.gz
chromium_src-a04db824d215692e471a1c21f8b8422eebdb3223.tar.bz2
Convert string16 to base::string16 in chrome/browser
TBR=sky Review URL: https://codereview.chromium.org/112943002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240149 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications/notification.cc')
-rw-r--r--chrome/browser/notifications/notification.cc28
1 files changed, 14 insertions, 14 deletions
diff --git a/chrome/browser/notifications/notification.cc b/chrome/browser/notifications/notification.cc
index 7adcd4a..4708376 100644
--- a/chrome/browser/notifications/notification.cc
+++ b/chrome/browser/notifications/notification.cc
@@ -11,8 +11,8 @@
Notification::Notification(const GURL& origin_url,
const GURL& content_url,
- const string16& display_source,
- const string16& replace_id,
+ const base::string16& display_source,
+ const base::string16& replace_id,
NotificationDelegate* delegate)
: message_center::Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
delegate->id(),
@@ -31,11 +31,11 @@ Notification::Notification(const GURL& origin_url,
Notification::Notification(const GURL& origin_url,
const GURL& icon_url,
- const string16& title,
- const string16& body,
+ const base::string16& title,
+ const base::string16& body,
blink::WebTextDirection dir,
- const string16& display_source,
- const string16& replace_id,
+ const base::string16& display_source,
+ const base::string16& replace_id,
NotificationDelegate* delegate)
: message_center::Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
delegate->id(),
@@ -59,13 +59,13 @@ Notification::Notification(const GURL& origin_url,
Notification::Notification(
message_center::NotificationType type,
const GURL& origin_url,
- const string16& title,
- const string16& body,
+ const base::string16& title,
+ const base::string16& body,
const gfx::Image& icon,
blink::WebTextDirection dir,
const message_center::NotifierId& notifier_id,
- const string16& display_source,
- const string16& replace_id,
+ const base::string16& display_source,
+ const base::string16& replace_id,
const message_center::RichNotificationData& rich_notification_data,
NotificationDelegate* delegate)
: message_center::Notification(type,
@@ -95,11 +95,11 @@ Notification::Notification(
Notification::Notification(const GURL& origin_url,
const gfx::Image& icon,
- const string16& title,
- const string16& body,
+ const base::string16& title,
+ const base::string16& body,
blink::WebTextDirection dir,
- const string16& display_source,
- const string16& replace_id,
+ const base::string16& display_source,
+ const base::string16& replace_id,
NotificationDelegate* delegate)
: message_center::Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
delegate->id(),