diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-11 04:03:32 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-11 04:03:32 +0000 |
| commit | ed95e02da69e469de255362cdb4114fe8e4c0c64 (patch) | |
| tree | 5bb68bc6517f35f14ca98498cbc4f52f8b3dcfff /ash/system/web_notification | |
| parent | 603af7ca8d0238e9b1a12b14a67655b831b047b7 (diff) | |
| download | chromium_src-ed95e02da69e469de255362cdb4114fe8e4c0c64.zip chromium_src-ed95e02da69e469de255362cdb4114fe8e4c0c64.tar.gz chromium_src-ed95e02da69e469de255362cdb4114fe8e4c0c64.tar.bz2 | |
Update src/ash/ for renames and moves in base
Renames string16 -> base::string16 and
base/string_number_conversions.h -> base/strings/string_number_conversions.h
BUG=
Review URL: https://codereview.chromium.org/13856005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193561 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/web_notification')
| -rw-r--r-- | ash/system/web_notification/web_notification_tray.cc | 4 | ||||
| -rw-r--r-- | ash/system/web_notification/web_notification_tray.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc index d410dbe..ed479d3 100644 --- a/ash/system/web_notification/web_notification_tray.cc +++ b/ash/system/web_notification/web_notification_tray.cc @@ -313,7 +313,7 @@ void WebNotificationTray::AnchorUpdated() { } } -string16 WebNotificationTray::GetAccessibleNameForTray() { +base::string16 WebNotificationTray::GetAccessibleNameForTray() { return l10n_util::GetStringUTF16( IDS_MESSAGE_CENTER_ACCESSIBLE_NAME); } @@ -359,7 +359,7 @@ void WebNotificationTray::OnMouseExitedView() { popup_bubble()->bubble()->OnMouseExitedView(); } -string16 WebNotificationTray::GetAccessibleNameForBubble() { +base::string16 WebNotificationTray::GetAccessibleNameForBubble() { return GetAccessibleNameForTray(); } diff --git a/ash/system/web_notification/web_notification_tray.h b/ash/system/web_notification/web_notification_tray.h index ed3e45d..7c4f01f 100644 --- a/ash/system/web_notification/web_notification_tray.h +++ b/ash/system/web_notification/web_notification_tray.h @@ -74,7 +74,7 @@ class ASH_EXPORT WebNotificationTray // Overridden from TrayBackgroundView. virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE; virtual void AnchorUpdated() OVERRIDE; - virtual string16 GetAccessibleNameForTray() OVERRIDE; + virtual base::string16 GetAccessibleNameForTray() OVERRIDE; virtual void HideBubbleWithView( const views::TrayBubbleView* bubble_view) OVERRIDE; virtual bool ClickedOutsideBubble() OVERRIDE; @@ -86,7 +86,7 @@ class ASH_EXPORT WebNotificationTray virtual void BubbleViewDestroyed() OVERRIDE; virtual void OnMouseEnteredView() OVERRIDE; virtual void OnMouseExitedView() OVERRIDE; - virtual string16 GetAccessibleNameForBubble() OVERRIDE; + virtual base::string16 GetAccessibleNameForBubble() OVERRIDE; virtual gfx::Rect GetAnchorRect(views::Widget* anchor_widget, AnchorType anchor_type, AnchorAlignment anchor_alignment) OVERRIDE; |