diff options
Diffstat (limited to 'chrome/browser/ui/cocoa/status_icons')
4 files changed, 11 insertions, 10 deletions
diff --git a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h index 6bd6570..c3f5cf0 100644 --- a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h +++ b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h @@ -26,10 +26,10 @@ class StatusIconMac : public StatusIcon { // Overridden from StatusIcon. virtual void SetImage(const gfx::ImageSkia& image) OVERRIDE; virtual void SetPressedImage(const gfx::ImageSkia& image) OVERRIDE; - virtual void SetToolTip(const string16& tool_tip) OVERRIDE; + virtual void SetToolTip(const base::string16& tool_tip) OVERRIDE; virtual void DisplayBalloon(const gfx::ImageSkia& icon, - const string16& title, - const string16& contents) OVERRIDE; + const base::string16& title, + const base::string16& contents) OVERRIDE; bool HasStatusIconMenu(); diff --git a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm index cc79fc6..32c1f81 100644 --- a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm +++ b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm @@ -79,7 +79,7 @@ void StatusIconMac::SetPressedImage(const gfx::ImageSkia& image) { } } -void StatusIconMac::SetToolTip(const string16& tool_tip) { +void StatusIconMac::SetToolTip(const base::string16& tool_tip) { // If we have a status icon menu, make the tool tip part of the menu instead // of a pop-up tool tip when hovering the mouse over the image. toolTip_.reset([base::SysUTF16ToNSString(tool_tip) retain]); @@ -92,8 +92,8 @@ void StatusIconMac::SetToolTip(const string16& tool_tip) { } void StatusIconMac::DisplayBalloon(const gfx::ImageSkia& icon, - const string16& title, - const string16& contents) { + const base::string16& title, + const base::string16& contents) { notification_.DisplayBalloon(icon, title, contents); } diff --git a/chrome/browser/ui/cocoa/status_icons/status_tray_mac.h b/chrome/browser/ui/cocoa/status_icons/status_tray_mac.h index 7325d86..7496892 100644 --- a/chrome/browser/ui/cocoa/status_icons/status_tray_mac.h +++ b/chrome/browser/ui/cocoa/status_icons/status_tray_mac.h @@ -17,7 +17,7 @@ class StatusTrayMac : public StatusTray { virtual StatusIcon* CreatePlatformStatusIcon( StatusIconType type, const gfx::ImageSkia& image, - const string16& tool_tip) OVERRIDE; + const base::string16& tool_tip) OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(StatusTrayMac); diff --git a/chrome/browser/ui/cocoa/status_icons/status_tray_mac.mm b/chrome/browser/ui/cocoa/status_icons/status_tray_mac.mm index 50dc797..bec5554 100644 --- a/chrome/browser/ui/cocoa/status_icons/status_tray_mac.mm +++ b/chrome/browser/ui/cocoa/status_icons/status_tray_mac.mm @@ -13,9 +13,10 @@ StatusTray* StatusTray::Create() { StatusTrayMac::StatusTrayMac() { } -StatusIcon* StatusTrayMac::CreatePlatformStatusIcon(StatusIconType type, - const gfx::ImageSkia& image, - const string16& tool_tip) { +StatusIcon* StatusTrayMac::CreatePlatformStatusIcon( + StatusIconType type, + const gfx::ImageSkia& image, + const base::string16& tool_tip) { StatusIcon* icon = new StatusIconMac(); icon->SetImage(image); icon->SetToolTip(tool_tip); |