| Index: chrome/browser/chromeos/file_manager/desktop_notifications.h
|
| diff --git a/chrome/browser/chromeos/file_manager/desktop_notifications.h b/chrome/browser/chromeos/file_manager/desktop_notifications.h
|
| index e98af5770d6880751f84ce9fe959252ca1b59199..e17b6f44024a86deebfe2ccc4d3e46fa12fad64f 100644
|
| --- a/chrome/browser/chromeos/file_manager/desktop_notifications.h
|
| +++ b/chrome/browser/chromeos/file_manager/desktop_notifications.h
|
| @@ -75,7 +75,7 @@ class DesktopNotifications
|
| return notification_map_.find(id) != notification_map_.end();
|
| }
|
|
|
| - string16 GetNotificationMessageForTest(const std::string& id) const;
|
| + base::string16 GetNotificationMessageForTest(const std::string& id) const;
|
|
|
| private:
|
| class NotificationMessage;
|
| @@ -87,10 +87,10 @@ class DesktopNotifications
|
| // Virtual for mock in unittest.
|
| virtual void ShowNotificationWithMessage(NotificationType type,
|
| const std::string& path,
|
| - const string16& message);
|
| + const base::string16& message);
|
| void ShowNotificationById(NotificationType type,
|
| const std::string& notification_id,
|
| - const string16& message);
|
| + const base::string16& message);
|
| void HideNotificationById(const std::string& notification_id);
|
| void RemoveNotificationById(const std::string& notification_id);
|
|
|
|
|