Index: ui/views/controls/menu/menu_delegate.h |
diff --git a/ui/views/controls/menu/menu_delegate.h b/ui/views/controls/menu/menu_delegate.h |
index f171d570b7e3d265f65e673eddc1298b488a166e..97ce1851954e2e688cf6156b5f79e94b6344879f 100644 |
--- a/ui/views/controls/menu/menu_delegate.h |
+++ b/ui/views/controls/menu/menu_delegate.h |
@@ -61,7 +61,7 @@ class VIEWS_EXPORT MenuDelegate { |
// The string shown for the menu item. This is only invoked when an item is |
// added with an empty label. |
- virtual string16 GetLabel(int id) const; |
+ virtual base::string16 GetLabel(int id) const; |
// The font for the menu item label. |
virtual const gfx::Font* GetLabelFont(int id) const; |
@@ -82,7 +82,8 @@ class VIEWS_EXPORT MenuDelegate { |
// The tooltip shown for the menu item. This is invoked when the user |
// hovers over the item, and no tooltip text has been set for that item. |
- virtual string16 GetTooltipText(int id, const gfx::Point& screen_loc) const; |
+ virtual base::string16 GetTooltipText(int id, |
+ const gfx::Point& screen_loc) const; |
// If there is an accelerator for the menu item with id |id| it is set in |
// |accelerator| and true is returned. |
@@ -104,7 +105,7 @@ class VIEWS_EXPORT MenuDelegate { |
// Controller |
virtual bool SupportsCommand(int id) const; |
virtual bool IsCommandEnabled(int id) const; |
- virtual bool GetContextualLabel(int id, string16* out) const; |
+ virtual bool GetContextualLabel(int id, base::string16* out) const; |
virtual void ExecuteCommand(int id) { |
} |