Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / toolbar / wrench_menu_model.h

diff --git a/src/chrome/browser/ui/toolbar/wrench_menu_model.h b/src/chrome/browser/ui/toolbar/wrench_menu_model.h
index 159b219..5dabbb5 100644 (file)
--- a/src/chrome/browser/ui/toolbar/wrench_menu_model.h
+++ b/src/chrome/browser/ui/toolbar/wrench_menu_model.h
@@ -100,7 +100,7 @@ class WrenchMenuModel : public ui::SimpleMenuModel,
 
   // Overridden for both ButtonMenuItemModel::Delegate and SimpleMenuModel:
   virtual bool IsItemForCommandIdDynamic(int command_id) const OVERRIDE;
-  virtual string16 GetLabelForCommandId(int command_id) const OVERRIDE;
+  virtual base::string16 GetLabelForCommandId(int command_id) const OVERRIDE;
   virtual bool GetIconForCommandId(int command_id,
                                    gfx::Image* icon) const OVERRIDE;
   virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
@@ -160,14 +160,13 @@ class WrenchMenuModel : public ui::SimpleMenuModel,
   void OnZoomLevelChanged(const content::HostZoomMap::ZoomLevelChange& change);
 
   bool ShouldShowNewIncognitoWindowMenuItem();
-  bool ShouldShowNewWindowMenuItem();
 
   // Models for the special menu items with buttons.
   scoped_ptr<ui::ButtonMenuItemModel> edit_menu_item_model_;
   scoped_ptr<ui::ButtonMenuItemModel> zoom_menu_item_model_;
 
   // Label of the zoom label in the zoom menu item.
-  string16 zoom_label_;
+  base::string16 zoom_label_;
 
   // Tools menu.
   scoped_ptr<ToolsMenuModel> tools_menu_model_;