Adds the ability to display text in a textfield when the text is

views/controls/textfield/native_textfield_gtk.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <gtk/gtk.h>
 
 #include "views/controls/textfield/native_textfield_gtk.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/gtk_util.h"
 #include "gfx/insets.h"
 #include "gfx/skia_utils_gtk.h"
+#include "views/controls/textfield/gtk_views_entry.h"
 #include "views/controls/textfield/textfield.h"
 
 namespace views {
+
 // A character used to hide a text in password mode.
-const char kPasswordChar = '*';
+static const char kPasswordChar = '*';
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTextfieldGtk, public:
 
 NativeTextfieldGtk::NativeTextfieldGtk(Textfield* textfield)
     : textfield_(textfield) {
   if (textfield_->style() & Textfield::STYLE_MULTILINE)
     NOTIMPLEMENTED();  // We don't support multiline yet.
   // Make |textfield| the focused view, so that when we get focused the focus
   // manager sees |textfield| as the focused view (since we are just a wrapper
   // view).
   set_focus_view(textfield);
 }
 
 NativeTextfieldGtk::~NativeTextfieldGtk() {
 }
 
+// Returns the inner border of an entry.
+// static
+gfx::Insets NativeTextfieldGtk::GetEntryInnerBorder(GtkEntry* entry) {
+  const GtkBorder* inner_border = gtk_entry_get_inner_border(entry);
+  if (inner_border)
+    return gfx::Insets(*inner_border);
+
+  // No explicit border set, try the style.
+  GtkBorder* style_border;
+  gtk_widget_style_get(GTK_WIDGET(entry), "inner-border", &style_border, NULL);
+  if (style_border) {
+    gfx::Insets insets = gfx::Insets(*style_border);
+    gtk_border_free(style_border);
+    return insets;
+  }
+
+  // If border is null, Gtk uses 2 on all sides.
+  return gfx::Insets(2, 2, 2, 2);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTextfieldGtk, NativeTextfieldWrapper implementation:
 
 string16 NativeTextfieldGtk::GetText() const {
   return UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(native_view())));
 }
 
 void NativeTextfieldGtk::UpdateText() {
   if (!native_view())
     return;
@@ skipping 97 matching lines @@
 }
 
 gfx::Insets NativeTextfieldGtk::CalculateInsets() {
   if (!native_view())
     return gfx::Insets();
 
   GtkWidget* widget = native_view();
   GtkEntry* entry = GTK_ENTRY(widget);
   gfx::Insets insets;
 
-  const GtkBorder* inner_border = gtk_entry_get_inner_border(entry);
-  if (inner_border) {
-    insets += gfx::Insets(*inner_border);
-  } else {
-    // No explicit border set, try the style.
-    GtkBorder* style_border;
-    gtk_widget_style_get(widget, "inner-border", &style_border, NULL);
-    if (style_border) {
-      insets += gfx::Insets(*style_border);
-      gtk_border_free(style_border);
-    } else {
-      // If border is null, Gtk uses 2 on all sides.
-      insets += gfx::Insets(2, 2, 2, 2);
-    }
-  }
+  insets += GetEntryInnerBorder(entry);
 
   if (entry->has_frame) {
     insets += gfx::Insets(widget->style->ythickness,
                           widget->style->xthickness,
                           widget->style->ythickness,
                           widget->style->xthickness);
   }
 
   gboolean interior_focus;
   gint focus_width;
@@ skipping 55 matching lines @@
   Textfield::Controller* controller = textfield_->GetController();
   if (controller)
     controller->ContentsChanged(textfield_, GetText());
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTextfieldGtk, NativeControlGtk overrides:
 
 void NativeTextfieldGtk::CreateNativeControl() {
-  NativeControlCreated(gtk_entry_new());
+  NativeControlCreated(gtk_views_entry_new(this));
   gtk_entry_set_invisible_char(GTK_ENTRY(native_view()),
                                static_cast<gunichar>(kPasswordChar));
   textfield_->UpdateAllProperties();
 }
 
 void NativeTextfieldGtk::NativeControlCreated(GtkWidget* widget) {
   NativeControlGtk::NativeControlCreated(widget);
   g_signal_connect(widget, "changed",
                    G_CALLBACK(OnChangedHandler), this);
   g_signal_connect(widget, "key-press-event",
                    G_CALLBACK(OnKeyPressEventHandler), this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTextfieldWrapper, public:
 
 // static
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
   return new NativeTextfieldGtk(field);
 }
 
 }  // namespace views