Fix browser crash in extensions due to painting badges on PageActions....

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 57 matching lines @@
   return std::wstring();
 }
 
 
 // PageActionWithBadgeView ----------------------------------------------------
 
 // A container for the PageActionImageView plus its badge.
 class LocationBarView::PageActionWithBadgeView : public views::View {
  public:
   explicit PageActionWithBadgeView(PageActionImageView* image_view);
+  virtual ~PageActionWithBadgeView() {}

[Aaron Boodman, 2010/01/21 23:10:58]

~View is virtual so I don't think this is necessary.

 
   PageActionImageView* image_view() { return image_view_; }
 
   virtual gfx::Size GetPreferredSize() {
     return gfx::Size(Extension::kPageActionIconMaxSize,
                      Extension::kPageActionIconMaxSize);
   }
 
   void UpdateVisibility(TabContents* contents, const GURL& url);
 
  private:
   virtual void Layout();
 
-  // Override PaintChildren so that we can paint the badge on top of children.
-  virtual void PaintChildren(gfx::Canvas* canvas);
-
   // The button this view contains.
   PageActionImageView* image_view_;
+
+  DISALLOW_COPY_AND_ASSIGN(PageActionWithBadgeView);
 };
 
 LocationBarView::PageActionWithBadgeView::PageActionWithBadgeView(
     PageActionImageView* image_view) {
   image_view_ = image_view;
   AddChildView(image_view_);
 }
 
 void LocationBarView::PageActionWithBadgeView::Layout() {
   // We have 25 pixels of vertical space in the Omnibox to play with, so even
   // sized icons (such as 16x16) have either a 5 or a 4 pixel whitespace
   // (padding) above and below. It looks better to have the extra pixel above
   // the icon than below it, so we add a pixel. http://crbug.com/25708.
   const SkBitmap& image = image_view()->GetImage();
   int y = (image.height() + 1) % 2;  // Even numbers: 1px padding. Odd: 0px.
   image_view_->SetBounds(0, y, width(), height());
 }
 
-void LocationBarView::PageActionWithBadgeView::PaintChildren(
-    gfx::Canvas* canvas) {
-  View::PaintChildren(canvas);
-
-  ExtensionAction* action = image_view_->page_action();
-  int tab_id = image_view_->current_tab_id();
-  if (tab_id < 0)
-    return;
-
-  action->PaintBadge(canvas, gfx::Rect(width(), height()), tab_id);
-}
-
 void LocationBarView::PageActionWithBadgeView::UpdateVisibility(
     TabContents* contents, const GURL& url) {
   image_view_->UpdateVisibility(contents, url);
   SetVisible(image_view_->IsVisible());
 }
 
 
 // LocationBarView -----------------------------------------------------------
 
 LocationBarView::LocationBarView(Profile* profile,
@@ skipping 1485 matching lines @@
           const int button = 1;  // Left mouse button.
           page_action_views_[i]->image_view()->ExecuteAction(button);
           return;
         }
         ++current;
       }
     }
   }
   NOTREACHED();
 }