Cleanup of about box

Removed redundent version from update string.
Added a line break to the ChromeOS version on test builds to improve appearence
(select and drag to see complete version).
Added margins to multiline edit fields without borders to make them match
single line edit fields in positioning.
Fixed an issue with setting the initial focus for GTK based windows. This
fixes the problem of the cursor showing up in the version field.

BUG=chromium-os:3571 1589 2967
TEST=none

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

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

1 files changed, 6 insertions, 1 deletions

diff --git a/views/controls/textfield/native_textfield_gtk.cc b/views/controls/textfield/native_textfield_gtk.cc
index f2f74a9..5da4b78 100644
--- a/views/controls/textfield/native_textfield_gtk.cc
+++ b/views/controls/textfield/native_textfield_gtk.cc
@@ -184,8 +184,13 @@ void NativeTextfieldGtk::UpdateBorder() {
     return;
 
   if (textfield_->IsMultiLine()) {
-    if (!textfield_->draw_border())
+    if (!textfield_->draw_border()) {
       gtk_container_set_border_width(GTK_CONTAINER(native_view()), 0);
+
+      // Use margin to match entry with no border
+      SetHorizontalMargins(kTextViewBorderWidth / 2 + 1,
+                           kTextViewBorderWidth / 2 + 1);
+    }
   } else {
     if (!textfield_->draw_border())
       gtk_entry_set_has_frame(GTK_ENTRY(native_view()), false);