summaryrefslogtreecommitdiffstats
path: root/ash/system/tray/hover_highlight_view.h
diff options
context:
space:
mode:
Diffstat (limited to 'ash/system/tray/hover_highlight_view.h')
-rw-r--r--ash/system/tray/hover_highlight_view.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/ash/system/tray/hover_highlight_view.h b/ash/system/tray/hover_highlight_view.h
index 75a63d5..982ccd8 100644
--- a/ash/system/tray/hover_highlight_view.h
+++ b/ash/system/tray/hover_highlight_view.h
@@ -30,18 +30,19 @@ class HoverHighlightView : public ActionableView {
// Convenience function for adding an icon and a label. This also sets the
// accessible name.
void AddIconAndLabel(const gfx::ImageSkia& image,
- const string16& text,
+ const base::string16& text,
gfx::Font::FontStyle style);
// Convenience function for adding a label with padding on the left for a
// blank icon. This also sets the accessible name.
// Returns label after parenting it.
- views::Label* AddLabel(const string16& text, gfx::Font::FontStyle style);
+ views::Label* AddLabel(const base::string16& text,
+ gfx::Font::FontStyle style);
// Convenience function for adding an optional check and a label. In the
// absence of a check, padding is added to align with checked items.
// Returns label after parenting it.
- views::Label* AddCheckableLabel(const string16& text,
+ views::Label* AddCheckableLabel(const base::string16& text,
gfx::Font::FontStyle style,
bool checked);