Give request-to-act badges a grey background, and increase spacing to make it fit.

chrome/browser/ui/gtk/location_bar_view_gtk.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/gtk/location_bar_view_gtk.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 102 matching lines @@
 // Spacing needed to align the bubble with the left side of the omnibox.
 const int kFirstRunBubbleLeftSpacing = 4;
 
 // 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 = 2;
 
 // Padding between the elements in the bar.
-const int kInnerPadding = 2;
+const int kInnerPadding = 9;

[Aaron Boodman, 2012/08/24 15:36:53]

We only want to change the layout in the case where script badges are enabled.

[Jeffrey Yasskin, 2012/08/29 00:37:50]

Good point. Done.

 
 // Padding between the right of the star and the edge of the URL entry.
-const int kStarRightPadding = 2;
+const int kStarRightPadding = 4;

[Jeffrey Yasskin, 2012/08/29 00:37:50]

Turns out this was unused.

 
 // 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 858 matching lines @@
   }
 
   WebContents* contents = GetWebContents();
   if (!page_action_views_.empty() && contents) {
     GURL url = chrome::GetActiveWebContents(browser())->GetURL();
 
     for (size_t i = 0; i < page_action_views_.size(); i++) {
       page_action_views_[i]->UpdateVisibility(
           toolbar_model_->input_in_progress() ? NULL : contents, url);
     }
+    gtk_widget_queue_draw(hbox_.get());
   }
 
   // If there are no visible page actions, hide the hbox too, so that it does
   // not affect the padding in the location bar.
   gtk_widget_set_visible(page_action_hbox_.get(),
                          PageActionVisibleCount() && !ShouldOnlyShowLocation());
 }
 
 void LocationBarViewGtk::InvalidatePageActions() {
   size_t count_before = page_action_views_.size();
@@ skipping 176 matching lines @@
       left = IDR_LOCATIONBG_L;
       center = IDR_LOCATIONBG_C;
       right = IDR_LOCATIONBG_R;
     }
 
     NineBox background(left, center, right,
                        0, 0, 0, 0, 0, 0);
     background.RenderToWidget(widget);
   }
 
+  // Draw ExtensionAction backgrounds and borders, if necessary.  The borders
+  // appear exactly between the elements, so they can't draw the borders
+  // themselves.
+  gfx::CanvasSkiaPaint canvas(event, false);

[Aaron Boodman, 2012/08/24 15:36:53]

Document the magic boolean, or else make it a named constant.

[Peter Kasting, 2012/08/24 23:08:28]

Honestly I'm not a huge fan of documenting at a callsite the value of something
that someone can simply look at the relevant class definition to find out...

[Jeffrey Yasskin, 2012/08/29 00:37:50]

I am a fan of doing this, and just forgot here. I find that locating the
relevant class definition is often hard/tedious enough that I just copy/paste
another use that I find, instead of figuring out what the value actually should
be. In this case ... should the argument actually be 'true'?

+  for (size_t i = 0; i < page_action_views_.size(); ++i) {

[Peter Kasting, 2012/08/24 23:08:28]

Nit: Use iterator (see location_bar_view.cc)

[Jeffrey Yasskin, 2012/08/29 00:37:50]

Done.

+    PageActionViewGtk& page_action_view = *page_action_views_[i];
+    if (page_action_view.IsVisible()) {
+      // Figure out where the page action is drawn so we can draw
+      // borders to its left and right.
+      GtkAllocation allocation;
+      gtk_widget_get_allocation(page_action_view.widget(), &allocation);
+      ExtensionAction* action = page_action_view.page_action();
+      gfx::Rect bounds(allocation);
+      // These offsets place the top and bottom edges on top of the darkest line
+      // in the location bar border, and the side edges on the pixels exactly
+      // between two page actions.  If the border image changes, these offsets
+      // will have to change to match.
+      bounds.Inset(-kInnerPadding / 2, -2,

[Peter Kasting, 2012/08/24 23:08:28]

How come we have to offset by -2 here and -1 in views?  It seems like the GTK
boxes ought to extend to flush inside the visible edge, so that we could then
just subtract 1 here (and you could then apply the technique suggested in
location_bar_view.cc).

[Jeffrey Yasskin, 2012/08/29 00:37:50]

The visible edge in gtk (http://i.imgur.com/tmB3A.png) and the  visible edge in
views (http://i.imgur.com/iluNi.png) are different sizes.

+                   -kInnerPadding / 2, -2);
+      action->PaintBackground(&canvas, bounds,
+                              SessionID::IdForTab(GetTabContents()));
+    }
+  }
+
   return FALSE;  // Continue propagating the expose.
 }
 
 void LocationBarViewGtk::UpdateSiteTypeArea() {
   // The icon is always visible except when the |tab_to_search_alignment_| is
   // visible.
   if (!location_entry_->model()->keyword().empty() &&
       !location_entry_->model()->is_keyword_hint()) {
     gtk_widget_hide(site_type_area());
     return;
@@ skipping 925 matching lines @@
 }
 
 void LocationBarViewGtk::PageActionViewGtk::InspectPopup(
     ExtensionAction* action) {
   ExtensionPopupGtk::Show(
       action->GetPopupUrl(current_tab_id_),
       owner_->browser_,
       event_box_.get(),
       ExtensionPopupGtk::SHOW_AND_INSPECT);
 }