Index: ui/views/controls/menu/menu_delegate.cc |
diff --git a/ui/views/controls/menu/menu_delegate.cc b/ui/views/controls/menu/menu_delegate.cc |
index 90ab5cbe1b26022f39c1e7c41c15ac1b553e0694..5e75915a65de26157e5db98e23b0f9e6d778897b 100644 |
--- a/ui/views/controls/menu/menu_delegate.cc |
+++ b/ui/views/controls/menu/menu_delegate.cc |
@@ -13,8 +13,8 @@ bool MenuDelegate::IsItemChecked(int id) const { |
return false; |
} |
-string16 MenuDelegate::GetLabel(int id) const { |
- return string16(); |
+base::string16 MenuDelegate::GetLabel(int id) const { |
+ return base::string16(); |
} |
const gfx::Font* MenuDelegate::GetLabelFont(int id) const { |
@@ -33,9 +33,9 @@ bool MenuDelegate::GetForegroundColor(int command_id, |
return false; |
} |
-string16 MenuDelegate::GetTooltipText(int id, |
+base::string16 MenuDelegate::GetTooltipText(int id, |
const gfx::Point& screen_loc) const { |
- return string16(); |
+ return base::string16(); |
} |
bool MenuDelegate::GetAccelerator(int id, ui::Accelerator* accelerator) { |
@@ -57,7 +57,7 @@ bool MenuDelegate::IsCommandEnabled(int id) const { |
return true; |
} |
-bool MenuDelegate::GetContextualLabel(int id, string16* out) const { |
+bool MenuDelegate::GetContextualLabel(int id, base::string16* out) const { |
return false; |
} |