Fix page action spacing on Linux.

Use the same constant for both Linux and Windows.

BUG=28660
TEST=load extensions, compare spacing

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

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

2 files changed, 5 insertions, 8 deletions

diff --git a/chrome/browser/gtk/location_bar_view_gtk.cc b/chrome/browser/gtk/location_bar_view_gtk.cc
index ab5f288..fd4d27f 100644
--- a/chrome/browser/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/gtk/location_bar_view_gtk.cc
@@ -61,9 +61,6 @@ const int kHboxBorder = 4;
 // Padding between the elements in the bar.
 static const int kInnerPadding = 4;
 
-// The size of each button on the toolbar.
-static const int kButtonSize = 29;
-
 // TODO(deanm): Eventually this should be painted with the background png
 // image, but for now we get pretty close by just drawing a solid border.
 const GdkColor kBorderColor = GDK_COLOR_RGB(0xbe, 0xc8, 0xd4);
@@ -688,7 +685,9 @@ LocationBarViewGtk::PageActionViewGtk::PageActionViewGtk(
       page_action_(page_action),
       last_icon_pixbuf_(NULL) {
   event_box_.Own(gtk_event_box_new());
-  gtk_widget_set_size_request(event_box_.get(), kButtonSize, kButtonSize);
+  gtk_widget_set_size_request(event_box_.get(),
+                              Extension::kPageActionIconMaxSize,
+                              Extension::kPageActionIconMaxSize);
 
   // Make the event box not visible so it does not paint a background.
   gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box_.get()), FALSE);
diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc
index 15ac714..c3ec267 100644
--- a/chrome/browser/views/location_bar_view.cc
+++ b/chrome/browser/views/location_bar_view.cc
@@ -43,9 +43,6 @@ static const int kEntryPadding = 3;
 // Padding between the entry and the leading/trailing views.
 static const int kInnerPadding = 3;
 
-// The size (both dimensions) of the buttons for page actions.
-static const int kPageActionButtonSize = 19;
-
 static const SkBitmap* kBackground = NULL;
 
 static const SkBitmap* kPopupBackground = NULL;
@@ -81,7 +78,8 @@ class LocationBarView::PageActionWithBadgeView : public views::View {
   PageActionImageView* image_view() { return image_view_; }
 
   virtual gfx::Size GetPreferredSize() {
-    return gfx::Size(kPageActionButtonSize, kPageActionButtonSize);
+    return gfx::Size(Extension::kPageActionIconMaxSize,
+                     Extension::kPageActionIconMaxSize);
   }
 
   void UpdateVisibility(TabContents* contents, const GURL& url);