Don't add subtext padding if there is no subpadding.

chrome/browser/ui/autofill/autofill_popup_controller_impl.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/autofill/autofill_popup_controller_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 21 matching lines @@
 
 // Size difference between name and subtext in pixels.
 const int kLabelFontSizeDelta = -2;
 
 // The vertical height of each row in pixels.
 const size_t kRowHeight = 24;
 
 // The vertical height of a separator in pixels.
 const size_t kSeparatorHeight = 1;
 
-// The amount of minimum padding between the Autofill name and subtext in
-// pixels.
-const size_t kNamePadding = 15;
-
 // The maximum amount of characters to display from either the name or subtext.
 const size_t kMaxTextLength = 15;
 
 #if !defined(OS_ANDROID)
+const size_t kNamePadding = AutofillPopupView::kNamePadding;
 const size_t kIconPadding = AutofillPopupView::kIconPadding;
 const size_t kEndPadding = AutofillPopupView::kEndPadding;
 const size_t kAutofillIconWidth = AutofillPopupView::kAutofillIconWidth;
 #endif
 
 struct DataResource {
   const char* name;
   int id;
 };
 
@@ skipping 434 matching lines @@
   int popup_height = 0;
 
   for (size_t i = 0; i < identifiers().size(); ++i) {
     popup_height += GetRowHeightFromId(identifiers()[i]);
   }
 
   return popup_height;
 }
 
 int AutofillPopupControllerImpl::RowWidthWithoutText(int row) const {
-  int row_size = kEndPadding + kNamePadding;
+  int row_size = kEndPadding;
+
+  if (!subtexts_[row].empty())
+    row_size += kNamePadding;
 
   // Add the Autofill icon size, if required.
   if (!icons_[row].empty())
     row_size += kAutofillIconWidth + kIconPadding;
 
   // Add the padding at the end
   row_size += kEndPadding;
 
   return row_size;
 }
@@ skipping 105 matching lines @@
     // The popup can appear below the field.
     return std::make_pair(bottom_growth_start, popup_required_height);
   } else {
     // The popup must appear above the field.
     return std::make_pair(top_growth_end - popup_required_height,
                           popup_required_height);
   }
 }
 
 }  // namespace autofill