Fix crash with page actions without icons

chrome/browser/views/location_bar_view.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/views/location_bar_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 74 matching lines @@
     return template_url->AdjustedShortNameForLocaleDirection();
   return std::wstring();
 }
 
 
 // PageActionWithBadgeView ----------------------------------------------------
 
 // A container for the PageActionImageView plus its badge.
 class LocationBarView::PageActionWithBadgeView : public views::View {
  public:
-  PageActionWithBadgeView(PageActionImageView* image_view);
+  explicit PageActionWithBadgeView(PageActionImageView* image_view);
 
   PageActionImageView* image_view() { return image_view_; }
 
   virtual gfx::Size GetPreferredSize() {
     return gfx::Size(kPageActionButtonSize, kPageActionButtonSize);
   }
 
   void UpdateVisibility(TabContents* contents, const GURL& url);
 
  private:
@@ skipping 585 matching lines @@
                                page_action_views_.end());
     page_action_views_.clear();
   }
 }
 
 void LocationBarView::RefreshPageActionViews() {
   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;
+  }
+
   // On startup we sometimes haven't loaded any extensions. This makes sure
   // we catch up when the extensions (and any page actions) load.
   if (page_actions.size() != page_action_views_.size()) {
     DeletePageActionViews();  // Delete the old views (if any).
 
     page_action_views_.resize(page_actions.size());
 
     for (size_t i = 0; i < page_actions.size(); ++i) {
       page_action_views_[i] = new PageActionWithBadgeView(
           new PageActionImageView(this, profile_,
@@ skipping 687 matching lines @@
 }
 
 int LocationBarView::PageActionVisibleCount() {
   int result = 0;
   for (size_t i = 0; i < page_action_views_.size(); i++) {
     if (page_action_views_[i]->IsVisible())
       ++result;
   }
   return result;
 }