| Index: ui/views/controls/menu/menu_model_adapter.cc
|
| diff --git a/ui/views/controls/menu/menu_model_adapter.cc b/ui/views/controls/menu/menu_model_adapter.cc
|
| index 07f1f403fd82fe9f22beb04c5dd40ea96f1fd562..6b29e7e0b059c94eb8c610a5509cfb05a59a0c64 100644
|
| --- a/ui/views/controls/menu/menu_model_adapter.cc
|
| +++ b/ui/views/controls/menu/menu_model_adapter.cc
|
| @@ -59,7 +59,7 @@ MenuItemView* MenuModelAdapter::AddMenuItemFromModelAt(ui::MenuModel* model,
|
| int item_id) {
|
| gfx::Image icon;
|
| model->GetIconAt(model_index, &icon);
|
| - string16 label, sublabel, minor_text;
|
| + base::string16 label, sublabel, minor_text;
|
| ui::MenuSeparatorType separator_style = ui::NORMAL_SEPARATOR;
|
| MenuItemView::Type type;
|
| ui::MenuModel::ItemType menu_type = model->GetTypeAt(model_index);
|
| @@ -171,14 +171,14 @@ bool MenuModelAdapter::GetAccelerator(int id,
|
| return false;
|
| }
|
|
|
| -string16 MenuModelAdapter::GetLabel(int id) const {
|
| +base::string16 MenuModelAdapter::GetLabel(int id) const {
|
| ui::MenuModel* model = menu_model_;
|
| int index = 0;
|
| if (ui::MenuModel::GetModelAndIndexForCommandId(id, &model, &index))
|
| return model->GetLabelAt(index);
|
|
|
| NOTREACHED();
|
| - return string16();
|
| + return base::string16();
|
| }
|
|
|
| const gfx::Font* MenuModelAdapter::GetLabelFont(int id) const {
|
|
|