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

3 files changed, 10 insertions, 11 deletions

diff --git a/chrome/browser/views/tab_contents/render_view_context_menu_win.cc b/chrome/browser/views/tab_contents/render_view_context_menu_win.cc
index 8f31491..63bbca6 100644
--- a/chrome/browser/views/tab_contents/render_view_context_menu_win.cc
+++ b/chrome/browser/views/tab_contents/render_view_context_menu_win.cc
@@ -91,21 +91,20 @@ void RenderViewContextMenuWin::AppendMenuItem(int id) {
 }
 
 void RenderViewContextMenuWin::AppendMenuItem(int id,
-                                              const std::wstring& label) {
+                                              const string16& label) {
   current_radio_group_id_ = -1;
   GetTargetModel()->AddItem(id, label);
 }
 
 void RenderViewContextMenuWin::AppendRadioMenuItem(int id,
-                                                   const std::wstring& label) {
+                                                   const string16& label) {
   if (current_radio_group_id_ < 0)
     current_radio_group_id_ = id;
   GetTargetModel()->AddRadioItem(id, label, current_radio_group_id_);
 }
 
-void RenderViewContextMenuWin::AppendCheckboxMenuItem(
-    int id,
-    const std::wstring& label) {
+void RenderViewContextMenuWin::AppendCheckboxMenuItem(int id,
+                                                      const string16& label) {
   current_radio_group_id_ = -1;
   GetTargetModel()->AddCheckItem(id, label);
 }
@@ -115,7 +114,7 @@ void RenderViewContextMenuWin::AppendSeparator() {
   GetTargetModel()->AddSeparator();
 }
 
-void RenderViewContextMenuWin::StartSubMenu(int id, const std::wstring& label) {
+void RenderViewContextMenuWin::StartSubMenu(int id, const string16& label) {
   if (sub_menu_contents_) {
     NOTREACHED() << "nested submenus not supported yet";
     return;
diff --git a/chrome/browser/views/tab_contents/render_view_context_menu_win.h b/chrome/browser/views/tab_contents/render_view_context_menu_win.h
index e897e7e..4ff68b9 100644
--- a/chrome/browser/views/tab_contents/render_view_context_menu_win.h
+++ b/chrome/browser/views/tab_contents/render_view_context_menu_win.h
@@ -36,11 +36,11 @@ class RenderViewContextMenuWin : public RenderViewContextMenu,
   // RenderViewContextMenu implementation --------------------------------------
   virtual void DoInit();
   virtual void AppendMenuItem(int id);
-  virtual void AppendMenuItem(int id, const std::wstring& label);
-  virtual void AppendRadioMenuItem(int id, const std::wstring& label);
-  virtual void AppendCheckboxMenuItem(int id, const std::wstring& label);
+  virtual void AppendMenuItem(int id, const string16& label);
+  virtual void AppendRadioMenuItem(int id, const string16& label);
+  virtual void AppendCheckboxMenuItem(int id, const string16& label);
   virtual void AppendSeparator();
-  virtual void StartSubMenu(int id, const std::wstring& label);
+  virtual void StartSubMenu(int id, const string16& label);
   virtual void FinishSubMenu();
 
  private:
diff --git a/chrome/browser/views/tab_contents/tab_contents_view_gtk.cc b/chrome/browser/views/tab_contents/tab_contents_view_gtk.cc
index a4d8ad6..32fedaa 100644
--- a/chrome/browser/views/tab_contents/tab_contents_view_gtk.cc
+++ b/chrome/browser/views/tab_contents/tab_contents_view_gtk.cc
@@ -100,7 +100,7 @@ TabContentsViewGtk::~TabContentsViewGtk() {
 
 void TabContentsViewGtk::CreateView() {
   set_delete_on_destroy(false);
-  WidgetGtk::Init(NULL, gfx::Rect(), false);
+  WidgetGtk::Init(NULL, gfx::Rect());
 }
 
 RenderWidgetHostView* TabContentsViewGtk::CreateViewForWidget(