Fix crash with page actions without icons

chrome/browser/gtk/location_bar_view_gtk.cc

 // Copyright (c) 2009 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/gfx/canvas_paint.h"
 #include "app/gfx/gtk_util.h"
@@ skipping 391 matching lines @@
 void LocationBarViewGtk::FocusSearch() {
   location_entry_->SetFocus();
   location_entry_->SetForcedQuery();
 }
 
 void LocationBarViewGtk::UpdatePageActions() {
   std::vector<ExtensionAction*> page_actions;
   if (profile_->GetExtensionsService())
       page_actions = profile_->GetExtensionsService()->GetPageActions();
 
+  // Page actions can be created without an icon, so make sure we count only
+  // those that have been given an icon.
+  for (size_t i = 0; i < page_actions.size();) {
+    if (page_actions[i]->icon_paths().empty())
+      page_actions.erase(page_actions.begin() + i);
+    else
+      ++i;
+  }
+
   // Initialize on the first call, or re-inialize if more extensions have been
   // loaded or added after startup.
   if (page_actions.size() != page_action_views_.size()) {
     page_action_views_.reset();  // Delete the old views (if any).
 
     for (size_t i = 0; i < page_actions.size(); ++i) {
       page_action_views_.push_back(
           new PageActionViewGtk(this, profile_, page_actions[i]));
       gtk_box_pack_end(GTK_BOX(page_action_hbox_),
                        page_action_views_[i]->widget(), FALSE, FALSE, 0);
@@ skipping 389 matching lines @@
   const ExtensionActionState* state =
       contents->GetPageActionState(view->page_action_);
   if (!state || state->badge_text().empty())
     return FALSE;
 
   gfx::CanvasPaint canvas(event, false);
   gfx::Rect bounding_rect(widget->allocation);
   state->PaintBadge(&canvas, bounding_rect);
   return FALSE;
 }