From a5176dafb70d5ea7567b18917d85c4cddc937dc4 Mon Sep 17 00:00:00 2001
From: "brettw@chromium.org"
<brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 2 Jul 2009 16:21:17 +0000
Subject: Convert menu strings to UTF16, fix some views-GTK build errors.
Review URL: http://codereview.chromium.org/150171
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19820 0039d316-1c4b-4281-b951-d872f2087c98
---
views/controls/menu/menu_2.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
(limited to 'views/controls/menu/menu_2.h')
diff --git a/views/controls/menu/menu_2.h b/views/controls/menu/menu_2.h
index 665b807..045309e 100644
--- a/views/controls/menu/menu_2.h
+++ b/views/controls/menu/menu_2.h
@@ -5,9 +5,8 @@
#ifndef CONTROLS_MENU_VIEWS_MENU_2_H_
#define CONTROLS_MENU_VIEWS_MENU_2_H_
-#include <string>
-
#include "base/gfx/native_widget_types.h"
+#include "base/string16.h"
namespace gfx {
class Point;
@@ -58,7 +57,7 @@ class Menu2Model {
virtual int GetCommandIdAt(int index) const = 0;
// Returns the label of the item at the specified index.
- virtual std::wstring GetLabelAt(int index) const = 0;
+ virtual string16 GetLabelAt(int index) const = 0;
// Returns true if the label at the specified index can change over the course
// of the menu's lifetime. If this function returns true, the label of the
--
cgit v1.1