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

chrome/browser/ui/autofill/autofill_popup_controller_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_CONTROLLER_IMPL_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
@@ skipping 114 matching lines @@
   virtual void ShowView();
   virtual void InvalidateRow(size_t row);
 
   // Protected so tests can access.
 #if !defined(OS_ANDROID)
   // Calculates the desired width of the popup based on its contents.
   int GetDesiredPopupWidth() const;
 
   // Calculates the desired height of the popup based on its contents.
   int GetDesiredPopupHeight() const;
+
+  // Calculate the width of the row, excluding all the text. This provides
+  // the size of the row that won't be reducible (since all the text can be
+  // elided if there isn't enough space).
+  int RowWidthWithoutText(int row) const;
 #endif
 
   base::WeakPtr<AutofillPopupControllerImpl> GetWeakPtr();
 
  private:
   const gfx::Rect RoundedElementBounds() const;
 #if !defined(OS_ANDROID)
-  // Calculate the width of the row, excluding all the text. This provides
-  // the size of the row that won't be reducible (since all the text can be
-  // elided if there isn't enough space).
-  int RowWidthWithoutText(int row) const;
-
   // Calculates and sets the bounds of the popup, including placing it properly
   // to prevent it from going off the screen.
   void UpdatePopupBounds();
 #endif
 
   // A helper function to get the display closest to the given point (virtual
   // for testing).
   virtual gfx::Display GetDisplayNearestPoint(const gfx::Point& point) const;
 
   // Calculates the width of the popup and the x position of it. These values
@@ skipping 41 matching lines @@
   // The line that is currently selected by the user.
   // |kNoSelection| indicates that no line is currently selected.
   int selected_line_;
 
   base::WeakPtrFactory<AutofillPopupControllerImpl> weak_ptr_factory_;
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_CONTROLLER_IMPL_H_