Prefix string16 with base:: in ui/.

ui/views/controls/menu/menu_model_adapter.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/menu/menu_model_adapter.h"
 
 #include "base/logging.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/image/image.h"
@@ skipping 41 matching lines @@
 }
 
 // Static.
 MenuItemView* MenuModelAdapter::AddMenuItemFromModelAt(ui::MenuModel* model,
                                                        int model_index,
                                                        MenuItemView* menu,
                                                        int menu_index,
                                                        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);
 
   switch (menu_type) {
     case ui::MenuModel::TYPE_COMMAND:
       type = MenuItemView::NORMAL;
       label = model->GetLabelAt(model_index);
       sublabel = model->GetSublabelAt(model_index);
       minor_text = model->GetMinorTextAt(model_index);
@@ skipping 91 matching lines @@
                                       ui::Accelerator* accelerator) {
   ui::MenuModel* model = menu_model_;
   int index = 0;
   if (ui::MenuModel::GetModelAndIndexForCommandId(id, &model, &index))
     return model->GetAcceleratorAt(index, accelerator);
 
   NOTREACHED();
   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 {
   ui::MenuModel* model = menu_model_;
   int index = 0;
   if (ui::MenuModel::GetModelAndIndexForCommandId(id, &model, &index)) {
     const gfx::Font* font = model->GetLabelFontAt(index);
     if (font)
       return font;
   }
@@ skipping 84 matching lines @@
       has_icons = has_icons || item->has_icons();
 
       menu_map_[item] = submodel;
     }
   }
 
   menu->set_has_icons(has_icons);
 }
 
 }  // namespace views