Revert "Revert 29457, because this is making ExtensionBrowserTest.PageAction crash on Vista"

chrome/browser/views/location_bar_view.cc

Index: chrome/browser/views/location_bar_view.cc
diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc
index e5e4ece39e0331fdd03e9ebaea5cb6866adc44ec..e6ee32e4453a51111425f29e01d414d587aff4e3 100644
--- a/chrome/browser/views/location_bar_view.cc
+++ b/chrome/browser/views/location_bar_view.cc
@@ -1172,6 +1172,19 @@ void LocationBarView::SecurityImageView::ShowInfoBubble() {
       SECURITY_INFO_BUBBLE_TEXT));
 }
 
+void LocationBarView::PageActionImageView::Paint(gfx::Canvas* canvas) {
+  LocationBarImageView::Paint(canvas);
+
+  TabContents* contents = owner_->delegate_->GetTabContents();
+  if (!contents)
+    return;
+
+  const ExtensionActionState* state =
+      contents->GetPageActionState(page_action_);
+  if (state)
+    state->PaintBadge(canvas, gfx::Rect(width(), height()));
+}
+
 // PageActionImageView----------------------------------------------------------
 
 LocationBarView::PageActionImageView::PageActionImageView(