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

chrome/browser/views/location_bar_view.cc

Index: chrome/browser/views/location_bar_view.cc
===================================================================
--- chrome/browser/views/location_bar_view.cc	(revision 36660)
+++ chrome/browser/views/location_bar_view.cc	(working copy)
@@ -75,6 +75,7 @@
 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_; }
 
@@ -88,11 +89,10 @@
  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(
@@ -111,18 +111,6 @@
   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);