GTK: Add padding in a couple places on the toolbar.

chrome/browser/gtk/location_bar_view_gtk.cc

 // Copyright (c) 2010 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/gtk/location_bar_view_gtk.h"
 
 #include <string>
 
 #include "app/gtk_dnd_util.h"
 #include "app/l10n_util.h"
@@ skipping 61 matching lines @@
 // Extra vertical spacing for first run bubble.
 const int kFirstRunBubbleTopMargin = 5;
 
 // The padding around the top, bottom, and sides of the location bar hbox.
 // We don't want to edit control's text to be right against the edge,
 // as well the tab to search box and other widgets need to have the padding on
 // top and bottom to avoid drawing larger than the location bar space.
 const int kHboxBorder = 4;
 
 // Padding between the elements in the bar.
-static const int kInnerPadding = 4;
+const int kInnerPadding = 4;
+
+// Padding between the right of the star and the edge of the URL entry.
+const int kStarRightPadding = 2;
 
 // Colors used to draw the EV certificate rounded bubble.
 const GdkColor kEvSecureTextColor = GDK_COLOR_RGB(0x07, 0x95, 0x00);
 const GdkColor kEvSecureBackgroundColor = GDK_COLOR_RGB(0xef, 0xfc, 0xef);
 const GdkColor kEvSecureBorderColor = GDK_COLOR_RGB(0x90, 0xc3, 0x90);
 
 // Colors used to draw the Tab to Search rounded bubble.
 const GdkColor kKeywordBackgroundColor = GDK_COLOR_RGB(0xf0, 0xf4, 0xfa);
 const GdkColor kKeywordBorderColor = GDK_COLOR_RGB(0xcb, 0xde, 0xf7);
 
@@ skipping 372 matching lines @@
   if (show_selected_keyword_)
     SetKeywordLabel(keyword);
 
   if (show_keyword_hint_)
     SetKeywordHintLabel(keyword);
 
   AdjustChildrenVisibility();
 }
 
 void LocationBarViewGtk::CreateStarButton() {
+  star_image_ = gtk_image_new();
+
+  GtkWidget* alignment = gtk_alignment_new(0, 0, 1, 1);
+  gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 0, 0,
+                            0, kStarRightPadding);
+  gtk_container_add(GTK_CONTAINER(alignment), star_image_);
+
   star_.Own(gtk_event_box_new());
   gtk_event_box_set_visible_window(GTK_EVENT_BOX(star_.get()), FALSE);
-  star_image_ = gtk_image_new();
-  gtk_container_add(GTK_CONTAINER(star_.get()), star_image_);
+  gtk_container_add(GTK_CONTAINER(star_.get()), alignment);
   gtk_widget_show_all(star_.get());
   ViewIDUtil::SetID(star_.get(), VIEW_ID_STAR_BUTTON);
 
   gtk_widget_set_tooltip_text(star_.get(),
       l10n_util::GetStringUTF8(IDS_TOOLTIP_STAR).c_str());
   g_signal_connect(star_.get(), "button-press-event",
                    G_CALLBACK(OnStarButtonPressThunk), this);
 }
 
 void LocationBarViewGtk::OnInputInProgress(bool in_progress) {
@@ skipping 905 matching lines @@
 
   std::string badge_text = page_action_->GetBadgeText(tab_id);
   if (badge_text.empty())
     return FALSE;
 
   gfx::CanvasSkiaPaint canvas(event, false);
   gfx::Rect bounding_rect(widget->allocation);
   page_action_->PaintBadge(&canvas, bounding_rect, tab_id);
   return FALSE;
 }