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

10 files changed, 27 insertions, 28 deletions

diff --git a/chrome/browser/views/bookmark_context_menu.h b/chrome/browser/views/bookmark_context_menu.h
index d1d7bad5..96304d4 100644
--- a/chrome/browser/views/bookmark_context_menu.h
+++ b/chrome/browser/views/bookmark_context_menu.h
@@ -29,7 +29,7 @@ class BookmarkContextMenu : public BookmarkContextMenuControllerDelegate,
   virtual void ExecuteCommand(int command_id);
   virtual bool IsItemChecked(int command_id) const;
   virtual bool IsCommandEnabled(int command_id) const;
-    
+
   // Overridden from BookmarkContextMenuControllerDelegate:
   virtual void CloseMenu();
   virtual void AddItem(int command_id);
@@ -38,15 +38,14 @@ class BookmarkContextMenu : public BookmarkContextMenuControllerDelegate,
   virtual void AddCheckboxItem(int command_id);
 
  private:
-  
   scoped_ptr<BookmarkContextMenuController> controller_;
 
-  // The window used to parent dialog boxes opened from the context menu.
-  gfx::NativeWindow parent_window_;
+  // The parent of dialog boxes opened from the context menu.
+  gfx::NativeView parent_window_;
 
   // The menu itself.
   scoped_ptr<views::MenuItemView> menu_;
-  
+
   DISALLOW_COPY_AND_ASSIGN(BookmarkContextMenu);
 };
 
diff --git a/chrome/browser/views/browser_bubble_gtk.cc b/chrome/browser/views/browser_bubble_gtk.cc
index bc717ab..b30fb1c 100644
--- a/chrome/browser/views/browser_bubble_gtk.cc
+++ b/chrome/browser/views/browser_bubble_gtk.cc
@@ -14,7 +14,7 @@ void BrowserBubble::InitPopup() {
   views::WidgetGtk* pop = new views::WidgetGtk(views::WidgetGtk::TYPE_POPUP);
   pop->set_delete_on_destroy(false);
   pop->SetOpacity(0xFF);
-  pop->Init(native_view, bounds_, false);
+  pop->Init(native_view, bounds_);
   pop->SetContentsView(view_);
   popup_.reset(pop);
   Reposition();
diff --git a/chrome/browser/views/browser_dialogs.h b/chrome/browser/views/browser_dialogs.h
index 9f33f64..c2b13f3 100644
--- a/chrome/browser/views/browser_dialogs.h
+++ b/chrome/browser/views/browser_dialogs.h
@@ -21,6 +21,7 @@ class HtmlDialogUIDelegate;
 class InfoBubbleDelegate;
 class Profile;
 class TabContents;
+class TemplateURL;
 
 namespace gfx {
 class Rect;
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 420b308..04d9988 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -1075,7 +1075,7 @@ bool BrowserView::IsLabelForCommandIdDynamic(int command_id) const {
   return command_id == IDC_RESTORE_TAB;
 }
 
-std::wstring BrowserView::GetLabelForCommandId(int command_id) const {
+string16 BrowserView::GetLabelForCommandId(int command_id) const {
   DCHECK(command_id == IDC_RESTORE_TAB);
 
   int string_id = IDS_RESTORE_TAB;
@@ -1084,7 +1084,7 @@ std::wstring BrowserView::GetLabelForCommandId(int command_id) const {
     if (trs && trs->entries().front()->type == TabRestoreService::WINDOW)
       string_id = IDS_RESTORE_WINDOW;
   }
-  return l10n_util::GetString(string_id);
+  return l10n_util::GetStringUTF16(string_id);
 }
 
 void BrowserView::ExecuteCommand(int command_id) {
diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h
index c21b2a2..fd321ce 100644
--- a/chrome/browser/views/frame/browser_view.h
+++ b/chrome/browser/views/frame/browser_view.h
@@ -264,7 +264,7 @@ class BrowserView : public BrowserWindow,
   virtual bool GetAcceleratorForCommandId(int command_id,
                                           views::Accelerator* accelerator);
   virtual bool IsLabelForCommandIdDynamic(int command_id) const;
-  virtual std::wstring GetLabelForCommandId(int command_id) const;
+  virtual string16 GetLabelForCommandId(int command_id) const;
   virtual void ExecuteCommand(int command_id);
 
   // Overridden from views::WindowDelegate:
diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc
index 7fa99de..a4d57ff 100644
--- a/chrome/browser/views/info_bubble.cc
+++ b/chrome/browser/views/info_bubble.cc
@@ -135,7 +135,7 @@ void InfoBubble::Init(views::Window* parent,
 #if defined(OS_WIN)
   WidgetWin::Init(parent->GetNativeWindow(), bounds);
 #else
-  WidgetGtk::Init(GTK_WIDGET(parent->GetNativeWindow()), bounds, true);
+  WidgetGtk::Init(GTK_WIDGET(parent->GetNativeWindow()), bounds);
 #endif
   SetContentsView(content_view_);
   // The preferred size may differ when parented. Ask for the bounds again
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(
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 430da1c..d92a876 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -106,12 +106,12 @@ void EncodingMenuModel::Build() {
       AddSeparator();
     } else {
       if (id == IDC_ENCODING_AUTO_DETECT) {
-        AddCheckItem(id, label);
+        AddCheckItem(id, WideToUTF16Hack(label));
       } else {
         // Use the id of the first radio command as the id of the group.
         if (group_id <= 0)
           group_id = id;
-        AddRadioItem(id, label, group_id);
+        AddRadioItem(id, WideToUTF16Hack(label), group_id);
       }
     }
   }
@@ -290,7 +290,7 @@ void ToolbarView::OnGetProfilesDone(
   for (int i = IDC_NEW_WINDOW_PROFILE_0;
        (i <= IDC_NEW_WINDOW_PROFILE_LAST) && (iter != profiles.end());
        ++i, ++iter)
-    profiles_menu_contents_->AddItem(i, *iter);
+    profiles_menu_contents_->AddItem(i, WideToUTF16Hack(*iter));
 
   // If there are more profiles then show "Other" link.
   if (iter != profiles.end()) {
@@ -1087,13 +1087,13 @@ void ToolbarView::CreateAppMenu() {
                                           IDS_IMPORT_SETTINGS);
   app_menu_contents_->AddSeparator();
   app_menu_contents_->AddItem(IDC_OPTIONS,
-                              l10n_util::GetStringF(
+                              l10n_util::GetStringFUTF16(
                                   IDS_OPTIONS,
-                                  l10n_util::GetString(IDS_PRODUCT_NAME)));
+                                  l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   app_menu_contents_->AddItem(IDC_ABOUT,
-                              l10n_util::GetStringF(
+                              l10n_util::GetStringFUTF16(
                                   IDS_ABOUT,
-                                  l10n_util::GetString(IDS_PRODUCT_NAME)));
+                                  l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
   app_menu_contents_->AddSeparator();
   app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT);