Migrate some wstring to string16 in chrome/browser/gtk/bookmark*.

BUG=23581

Review URL: http://codereview.chromium.org/3110003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55965 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 38 insertions, 34 deletions

diff --git a/chrome/browser/gtk/bookmark_bubble_gtk.cc b/chrome/browser/gtk/bookmark_bubble_gtk.cc
index db39e1ae..2e372ac 100644
--- a/chrome/browser/gtk/bookmark_bubble_gtk.cc
+++ b/chrome/browser/gtk/bookmark_bubble_gtk.cc
@@ -11,6 +11,7 @@
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
+#include "base/string16.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
@@ -271,12 +272,10 @@ void BookmarkBubbleGtk::ApplyEdits() {
   BookmarkModel* model = profile_->GetBookmarkModel();
   const BookmarkNode* node = model->GetMostRecentlyAddedNodeForURL(url_);
   if (node) {
-    // NOTE: Would be nice to save a strlen and use gtk_entry_get_text_length,
-    // but it is fairly new and not always in our GTK version.
-    const std::wstring new_title(
-        UTF8ToWide(gtk_entry_get_text(GTK_ENTRY(name_entry_))));
+    const string16 new_title(
+        UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(name_entry_))));
 
-    if (new_title != node->GetTitle()) {
+    if (new_title != node->GetTitleAsString16()) {
       model->SetTitle(node, new_title);
       UserMetrics::RecordAction(
           UserMetricsAction("BookmarkBubble_ChangeTitleInBubble"),
diff --git a/chrome/browser/gtk/bookmark_editor_gtk.cc b/chrome/browser/gtk/bookmark_editor_gtk.cc
index 318ba91..478e9e9 100644
--- a/chrome/browser/gtk/bookmark_editor_gtk.cc
+++ b/chrome/browser/gtk/bookmark_editor_gtk.cc
@@ -282,8 +282,8 @@ GURL BookmarkEditorGtk::GetInputURL() const {
                                  std::string());
 }
 
-std::wstring BookmarkEditorGtk::GetInputTitle() const {
-  return UTF8ToWide(gtk_entry_get_text(GTK_ENTRY(name_entry_)));
+string16 BookmarkEditorGtk::GetInputTitle() const {
+  return UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(name_entry_)));
 }
 
 void BookmarkEditorGtk::ApplyEdits() {
@@ -308,11 +308,11 @@ void BookmarkEditorGtk::ApplyEdits(GtkTreeIter* selected_parent) {
   bb_model_->RemoveObserver(this);
 
   GURL new_url(GetInputURL());
-  std::wstring new_title(GetInputTitle());
+  string16 new_title(GetInputTitle());
 
   if (!show_tree_ || !selected_parent) {
     bookmark_utils::ApplyEditsWithNoGroupChange(
-        bb_model_, parent_, details_, new_title, new_url);
+        bb_model_, parent_, details_, UTF16ToWide(new_title), new_url);
     return;
   }
 
@@ -328,7 +328,7 @@ void BookmarkEditorGtk::ApplyEdits(GtkTreeIter* selected_parent) {
   }
 
   bookmark_utils::ApplyEditsWithPossibleGroupChange(
-      bb_model_, new_parent, details_, new_title, new_url);
+      bb_model_, new_parent, details_, UTF16ToWide(new_title), new_url);
 }
 
 void BookmarkEditorGtk::AddNewGroup(GtkTreeIter* parent, GtkTreeIter* child) {
diff --git a/chrome/browser/gtk/bookmark_editor_gtk.h b/chrome/browser/gtk/bookmark_editor_gtk.h
index 4da3292..631ed45 100644
--- a/chrome/browser/gtk/bookmark_editor_gtk.h
+++ b/chrome/browser/gtk/bookmark_editor_gtk.h
@@ -11,6 +11,7 @@
 #include "app/gtk_integers.h"
 #include "app/gtk_signal.h"
 #include "base/gtest_prod_util.h"
+#include "base/string16.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
 
@@ -79,7 +80,7 @@ class BookmarkEditorGtk : public BookmarkEditor,
   GURL GetInputURL() const;
 
   // Returns the title the user has input.
-  std::wstring GetInputTitle() const;
+  string16 GetInputTitle() const;
 
   // Invokes ApplyEdits with the selected node.
   //
diff --git a/chrome/browser/gtk/bookmark_editor_gtk_unittest.cc b/chrome/browser/gtk/bookmark_editor_gtk_unittest.cc
index 8eba11a..bd7969c 100644
--- a/chrome/browser/gtk/bookmark_editor_gtk_unittest.cc
+++ b/chrome/browser/gtk/bookmark_editor_gtk_unittest.cc
@@ -115,21 +115,21 @@ TEST_F(BookmarkEditorGtkTest, ModelsMatch) {
   ASSERT_EQ(2, gtk_tree_model_iter_n_children(store, &bookmark_bar_node));
   ASSERT_TRUE(gtk_tree_model_iter_children(store, &child, &bookmark_bar_node));
   f1_iter = child;
-  ASSERT_EQ(L"F1", GetTitleFromTreeIter(store, &child));
+  ASSERT_EQ("F1", UTF16ToUTF8(GetTitleFromTreeIter(store, &child)));
   ASSERT_TRUE(gtk_tree_model_iter_next(store, &child));
-  ASSERT_EQ(L"F2", GetTitleFromTreeIter(store, &child));
+  ASSERT_EQ("F2", UTF16ToUTF8(GetTitleFromTreeIter(store, &child)));
   ASSERT_FALSE(gtk_tree_model_iter_next(store, &child));
 
   // F1 should have one child, F11
   ASSERT_EQ(1, gtk_tree_model_iter_n_children(store, &f1_iter));
   ASSERT_TRUE(gtk_tree_model_iter_children(store, &child, &f1_iter));
-  ASSERT_EQ(L"F11", GetTitleFromTreeIter(store, &child));
+  ASSERT_EQ("F11", UTF16ToUTF8(GetTitleFromTreeIter(store, &child)));
   ASSERT_FALSE(gtk_tree_model_iter_next(store, &child));
 
   // Other node should have one child (OF1).
   ASSERT_EQ(1, gtk_tree_model_iter_n_children(store, &other_node));
   ASSERT_TRUE(gtk_tree_model_iter_children(store, &child, &other_node));
-  ASSERT_EQ(L"OF1", GetTitleFromTreeIter(store, &child));
+  ASSERT_EQ("OF1", UTF16ToUTF8(GetTitleFromTreeIter(store, &child)));
   ASSERT_FALSE(gtk_tree_model_iter_next(store, &child));
 }
 
diff --git a/chrome/browser/gtk/bookmark_tree_model.cc b/chrome/browser/gtk/bookmark_tree_model.cc
index 715fad8..37e2767 100644
--- a/chrome/browser/gtk/bookmark_tree_model.cc
+++ b/chrome/browser/gtk/bookmark_tree_model.cc
@@ -49,12 +49,12 @@ void RecursiveResolve(BookmarkModel* bb_model, const BookmarkNode* bb_node,
   if (gtk_tree_model_iter_children(tree_model, &child_iter, parent_iter)) {
     do {
       int64 id = bookmark_utils::GetIdFromTreeIter(tree_model, &child_iter);
-      std::wstring title =
+      string16 title =
           bookmark_utils::GetTitleFromTreeIter(tree_model, &child_iter);
       const BookmarkNode* child_bb_node = NULL;
       if (id == 0) {
         child_bb_node = bb_model->AddGroup(bb_node, bb_node->GetChildCount(),
-                                           title);
+                                           UTF16ToWide(title));
       } else {
         // Existing node, reset the title (BBModel ignores changes if the title
         // is the same).
@@ -66,7 +66,7 @@ void RecursiveResolve(BookmarkModel* bb_model, const BookmarkNode* bb_node,
           }
         }
         DCHECK(child_bb_node);
-        bb_model->SetTitle(child_bb_node, title);
+        bb_model->SetTitle(child_bb_node, UTF16ToWide(title));
       }
       RecursiveResolve(bb_model, child_bb_node,
                        tree_model, &child_iter,
@@ -211,13 +211,13 @@ int64 GetIdFromTreeIter(GtkTreeModel* model, GtkTreeIter* iter) {
   return ret_val;
 }
 
-std::wstring GetTitleFromTreeIter(GtkTreeModel* model, GtkTreeIter* iter) {
+string16 GetTitleFromTreeIter(GtkTreeModel* model, GtkTreeIter* iter) {
   GValue value = { 0, };
-  std::wstring ret_val;
+  string16 ret_val;
   gtk_tree_model_get_value(model, iter, FOLDER_NAME, &value);
   if (G_VALUE_HOLDS_STRING(&value)) {
     const gchar* utf8str = g_value_get_string(&value);
-    ret_val = UTF8ToWide(utf8str);
+    ret_val = UTF8ToUTF16(utf8str);
     g_value_unset(&value);
   } else {
     NOTREACHED() << "Impossible type mismatch";
diff --git a/chrome/browser/gtk/bookmark_tree_model.h b/chrome/browser/gtk/bookmark_tree_model.h
index 4df7d41..2abbc69 100644
--- a/chrome/browser/gtk/bookmark_tree_model.h
+++ b/chrome/browser/gtk/bookmark_tree_model.h
@@ -8,6 +8,7 @@
 
 #include <string>
 #include "base/basictypes.h"
+#include "base/string16.h"
 
 class BookmarkModel;
 class BookmarkNode;
@@ -69,8 +70,8 @@ const BookmarkNode* CommitTreeStoreDifferencesBetween(
 // Returns the id field of the row pointed to by |iter|.
 int64 GetIdFromTreeIter(GtkTreeModel* model, GtkTreeIter* iter);
 
-// Returns the title field of the row pointed to by |iter|.
-std::wstring GetTitleFromTreeIter(GtkTreeModel* model, GtkTreeIter* iter);
+// Returns the title field in utf8 of the row pointed to by |iter|.
+string16 GetTitleFromTreeIter(GtkTreeModel* model, GtkTreeIter* iter);
 
 }  // namespace bookmark_utils
 
diff --git a/chrome/browser/gtk/bookmark_utils_gtk.cc b/chrome/browser/gtk/bookmark_utils_gtk.cc
index 3b5c3b5..85ebd8d 100644
--- a/chrome/browser/gtk/bookmark_utils_gtk.cc
+++ b/chrome/browser/gtk/bookmark_utils_gtk.cc
@@ -8,6 +8,7 @@
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/pickle.h"
+#include "base/string16.h"
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ -51,7 +52,7 @@ void* AsVoid(const BookmarkNode* node) {
 }
 
 // Creates the widget hierarchy for a bookmark button.
-void PackButton(GdkPixbuf* pixbuf, const std::wstring& title, bool ellipsize,
+void PackButton(GdkPixbuf* pixbuf, const string16& title, bool ellipsize,
                 GtkThemeProvider* provider, GtkWidget* button) {
   GtkWidget* former_child = gtk_bin_get_child(GTK_BIN(button));
   if (former_child)
@@ -64,7 +65,7 @@ void PackButton(GdkPixbuf* pixbuf, const std::wstring& title, bool ellipsize,
   GtkWidget* box = gtk_hbox_new(FALSE, kBarButtonPadding);
   gtk_box_pack_start(GTK_BOX(box), image, FALSE, FALSE, 0);
 
-  std::string label_string = WideToUTF8(title);
+  std::string label_string = UTF16ToUTF8(title);
   if (!label_string.empty()) {
     GtkWidget* label = gtk_label_new(label_string.c_str());
     // Until we switch to vector graphics, force the font size.
@@ -99,11 +100,11 @@ const int kDragRepresentationWidth = 140;
 struct DragRepresentationData {
  public:
   GdkPixbuf* favicon;
-  std::wstring text;
+  string16 text;
   SkColor text_color;
 
   DragRepresentationData(GdkPixbuf* favicon,
-                         const std::wstring& text,
+                         const string16& text,
                          SkColor text_color)
       : favicon(favicon),
         text(text),
@@ -140,7 +141,7 @@ gboolean OnDragIconExpose(GtkWidget* sender,
   int text_width = sender->allocation.width - text_x;
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
-  canvas.DrawStringInt(data->text,
+  canvas.DrawStringInt(UTF16ToWide(data->text),
                        base_font, data->text_color,
                        text_x, 0, text_width, sender->allocation.height);
 
@@ -179,7 +180,7 @@ GdkPixbuf* GetPixbufForNode(const BookmarkNode* node, BookmarkModel* model,
 }
 
 GtkWidget* GetDragRepresentation(GdkPixbuf* pixbuf,
-                                 const std::wstring& title,
+                                 const string16& title,
                                  GtkThemeProvider* provider) {
   GtkWidget* window = gtk_window_new(GTK_WINDOW_POPUP);
 
@@ -222,7 +223,8 @@ GtkWidget* GetDragRepresentationForNode(const BookmarkNode* node,
                                         BookmarkModel* model,
                                         GtkThemeProvider* provider) {
   GdkPixbuf* pixbuf = GetPixbufForNode(node, model, provider->UseGtkTheme());
-  GtkWidget* widget = GetDragRepresentation(pixbuf, node->GetTitle(), provider);
+  GtkWidget* widget = GetDragRepresentation(pixbuf,
+      node->GetTitleAsString16(), provider);
   g_object_unref(pixbuf);
   return widget;
 }
@@ -231,7 +233,7 @@ void ConfigureButtonForNode(const BookmarkNode* node, BookmarkModel* model,
                             GtkWidget* button, GtkThemeProvider* provider) {
   GdkPixbuf* pixbuf = bookmark_utils::GetPixbufForNode(node, model,
                                                        provider->UseGtkTheme());
-  PackButton(pixbuf, node->GetTitle(), node != model->other_node(),
+  PackButton(pixbuf, node->GetTitleAsString16(), node != model->other_node(),
              provider, button);
   g_object_unref(pixbuf);
 
diff --git a/chrome/browser/gtk/bookmark_utils_gtk.h b/chrome/browser/gtk/bookmark_utils_gtk.h
index 875e325..0e666c7 100644
--- a/chrome/browser/gtk/bookmark_utils_gtk.h
+++ b/chrome/browser/gtk/bookmark_utils_gtk.h
@@ -10,6 +10,7 @@
 #include <string>
 
 #include "app/gtk_integers.h"
+#include "base/string16.h"
 
 class BookmarkModel;
 class BookmarkNode;
@@ -33,7 +34,7 @@ GdkPixbuf* GetPixbufForNode(const BookmarkNode* node, BookmarkModel* model,
 // Returns a GtkWindow with a visual hierarchy for passing to
 // gtk_drag_set_icon_widget().
 GtkWidget* GetDragRepresentation(GdkPixbuf* pixbuf,
-                                 const std::wstring& title,
+                                 const string16& title,
                                  GtkThemeProvider* provider);
 GtkWidget* GetDragRepresentationForNode(const BookmarkNode* node,
                                         BookmarkModel* model,
diff --git a/chrome/browser/gtk/location_bar_view_gtk.cc b/chrome/browser/gtk/location_bar_view_gtk.cc
index ea379e3..95b1bbb 100644
--- a/chrome/browser/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/gtk/location_bar_view_gtk.cc
@@ -1004,8 +1004,8 @@ void LocationBarViewGtk::OnIconDragBegin(GtkWidget* sender,
   GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&favicon);
   if (!pixbuf)
     return;
-  drag_icon_ = bookmark_utils::GetDragRepresentation(pixbuf, GetTitle(),
-                                                     theme_provider_);
+  drag_icon_ = bookmark_utils::GetDragRepresentation(pixbuf,
+      WideToUTF16(GetTitle()), theme_provider_);
   g_object_unref(pixbuf);
   gtk_drag_set_icon_widget(context, drag_icon_, 0, 0);
 }