Porting textfield to toolkit_views Gtk.

BUG=None
TEST=Run the view unit-tests.

See original review:
http://codereview.chromium.org/165512/show
Review URL: http://codereview.chromium.org/180061

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

6 files changed, 16 insertions, 18 deletions

diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index a91d07b..190cc74 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -71,6 +71,7 @@
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils.h"
+#include "skia/ext/skia_utils_gtk.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/compact_navigation_bar.h"
@@ -479,9 +480,7 @@ GdkCursorType GdkWindowEdgeToGdkCursorType(GdkWindowEdge edge) {
 }
 
 GdkColor SkColorToGdkColor(const SkColor& color) {
-  GdkColor color_gdk = GDK_COLOR_RGB(SkColorGetR(color), SkColorGetG(color),
-                                     SkColorGetB(color));
-  return color_gdk;
+  return skia::SkColorToGdkColor(color);
 }
 
 }  // namespace
diff --git a/chrome/browser/gtk/gtk_theme_provider.cc b/chrome/browser/gtk/gtk_theme_provider.cc
index 8c76c6d..6b37ed5 100644
--- a/chrome/browser/gtk/gtk_theme_provider.cc
+++ b/chrome/browser/gtk/gtk_theme_provider.cc
@@ -16,6 +16,7 @@
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "grit/theme_resources.h"
+#include "skia/ext/skia_utils_gtk.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ -139,11 +140,7 @@ bool GtkThemeProvider::UseGtkTheme() {
 }
 
 GdkColor GtkThemeProvider::GetGdkColor(int id) {
-  SkColor color = GetColor(id);
-  GdkColor gdkcolor =
-      GDK_COLOR_RGB(SkColorGetR(color), SkColorGetG(color),
-                    SkColorGetB(color));
-  return gdkcolor;
+  return skia::SkColorToGdkColor(GetColor(id));
 }
 
 GdkColor GtkThemeProvider::GetBorderColor() {
diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc
index 545eb4a6..0ecf1b9 100644
--- a/chrome/browser/views/bookmark_bubble_view.cc
+++ b/chrome/browser/views/bookmark_bubble_view.cc
@@ -8,6 +8,7 @@
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/keyboard_codes.h"
+#include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ -290,7 +291,7 @@ void BookmarkBubbleView::Init() {
   layout->AddView(
       new Label(l10n_util::GetString(IDS_BOOMARK_BUBBLE_TITLE_TEXT)));
   title_tf_ = new views::Textfield();
-  title_tf_->SetText(GetTitle());
+  title_tf_->SetText(WideToUTF16(GetTitle()));
   layout->AddView(title_tf_);
 
   layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
@@ -420,7 +421,7 @@ void BookmarkBubbleView::ApplyEdits() {
   BookmarkModel* model = profile_->GetBookmarkModel();
   const BookmarkNode* node = model->GetMostRecentlyAddedNodeForURL(url_);
   if (node) {
-    const std::wstring new_title = title_tf_->text();
+    const std::wstring new_title = UTF16ToWide(title_tf_->text());
     if (new_title != node->GetTitle()) {
       model->SetTitle(node, new_title);
       UserMetrics::RecordAction(L"BookmarkBubble_ChangeTitleInBubble",
diff --git a/chrome/browser/views/find_bar_view.cc b/chrome/browser/views/find_bar_view.cc
index f747b2b..da1acd1 100644
--- a/chrome/browser/views/find_bar_view.cc
+++ b/chrome/browser/views/find_bar_view.cc
@@ -164,7 +164,7 @@ FindBarView::~FindBarView() {
 }
 
 void FindBarView::SetFindText(const string16& find_text) {
-  find_text_->SetText(UTF16ToWide(find_text));
+  find_text_->SetText(find_text);
 }
 
 void FindBarView::UpdateForResult(const FindNotificationDetails& result,
@@ -175,9 +175,9 @@ void FindBarView::UpdateForResult(const FindNotificationDetails& result,
   // If we don't have any results and something was passed in, then that means
   // someone pressed F3 while the Find box was closed. In that case we need to
   // repopulate the Find box with what was passed in.
-  std::wstring search_string = find_text_->text();
+  string16 search_string = find_text_->text();
   if (search_string.empty() && !find_text.empty()) {
-    find_text_->SetText(UTF16ToWide(find_text));
+    find_text_->SetText(find_text);
     find_text_->SelectAll();
   }
 
@@ -412,7 +412,7 @@ void FindBarView::ButtonPressed(views::Button* sender) {
     case FIND_NEXT_TAG:
       if (!find_text_->text().empty()) {
         container_->GetFindBarController()->tab_contents()->StartFinding(
-            WideToUTF16(find_text_->text()),
+            find_text_->text(),
             sender->tag() == FIND_NEXT_TAG,
             false);  // Not case sensitive.
       }
@@ -435,7 +435,7 @@ void FindBarView::ButtonPressed(views::Button* sender) {
 // FindBarView, views::Textfield::Controller implementation:
 
 void FindBarView::ContentsChanged(views::Textfield* sender,
-                                  const std::wstring& new_contents) {
+                                  const string16& new_contents) {
   FindBarController* controller = container_->GetFindBarController();
   DCHECK(controller);
   // We must guard against a NULL tab_contents, which can happen if the text
@@ -449,8 +449,7 @@ void FindBarView::ContentsChanged(views::Textfield* sender,
   // initiate search (even though old searches might be in progress).
   if (!new_contents.empty()) {
     // The last two params here are forward (true) and case sensitive (false).
-    controller->tab_contents()->StartFinding(WideToUTF16(new_contents),
-                                             true, false);
+    controller->tab_contents()->StartFinding(new_contents, true, false);
   } else {
     // The textbox is empty so we reset.  true = clear selection on page.
     controller->tab_contents()->StopFinding(true);
diff --git a/chrome/browser/views/find_bar_view.h b/chrome/browser/views/find_bar_view.h
index f83b175..8e3a664 100644
--- a/chrome/browser/views/find_bar_view.h
+++ b/chrome/browser/views/find_bar_view.h
@@ -67,7 +67,7 @@ class FindBarView : public views::View,
 
   // Overridden from views::Textfield::Controller:
   virtual void ContentsChanged(views::Textfield* sender,
-                               const std::wstring& new_contents);
+                               const string16& new_contents);
   virtual bool HandleKeystroke(views::Textfield* sender,
                                const views::Textfield::Keystroke& key);
 
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index f8c8485..d174b01 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -4199,6 +4199,7 @@
             # on linux, though.
             'browser/download/download_manager_unittest.cc',
             'browser/views/bookmark_context_menu_test.cc',
+	    'browser/gtk/options/cookies_view_unittest.cc',
             # Compact Language Detection (cld) is not supported in linux yet.
             '../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
           ],
@@ -4217,6 +4218,7 @@
              ['exclude', 'browser/gtk/bookmark_editor_gtk_unittest\\.cc$'],
              ['exclude', 'browser/gtk/go_button_gtk_unittest\\.cc$'],
              ['exclude', 'browser/gtk/tabs/tab_renderer_gtk_unittest\\.cc$'],
+             ['exclude', 'browser/gtk/options/cookies_view_unittest\\.cc$'],
           ],
         }],
         ['OS=="mac"', {