Reland Merge NativeTextfieldViews into views::Textfield.

chrome/browser/ui/views/autofill/autofill_dialog_views.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/views/autofill/autofill_dialog_views.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 190 matching lines @@
       icon->SetX(start_x);
       icon->SetY(bounds.y() +
           (bounds.height() - icon->bounds().height()) / 2);
       start_x += icon->bounds().width() + kAroundTextPadding;
     }
 
     // Textfield is right aligned.
     int end_x = bounds.width();
     views::View* decorated = child_at(2);
     if (decorated->visible()) {
-      decorated->SizeToPreferredSize();
-      decorated->SetX(bounds.width() - decorated->bounds().width());
-      decorated->SetY(bounds.y());
+      const int preferred_width = decorated->GetPreferredSize().width();
+      decorated->SetBounds(bounds.width() - preferred_width, bounds.y(),
+                           preferred_width, bounds.height());
       end_x = decorated->bounds().x() - kAroundTextPadding;
     }
 
     // Label takes up all the space in between.
     views::View* label = child_at(1);
     if (label->visible())
       label->SetBounds(start_x, bounds.y(), end_x - start_x, bounds.height());
 
     views::View::Layout();
   }
@@ skipping 2241 matching lines @@
 AutofillDialogViews::DetailsGroup::DetailsGroup(DialogSection section)
     : section(section),
       container(NULL),
       manual_input(NULL),
       suggested_info(NULL),
       suggested_button(NULL) {}
 
 AutofillDialogViews::DetailsGroup::~DetailsGroup() {}
 
 }  // namespace autofill