Refactor implementation of BrowserActions, and add support for

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 108 matching lines @@
 }
 
 void LocationBarView::PageActionWithBadgeView::Layout() {
   image_view_->SetBounds(0, 0, width(), height());
 }
 
 void LocationBarView::PageActionWithBadgeView::PaintChildren(
     gfx::Canvas* canvas) {
   View::PaintChildren(canvas);
   const ExtensionActionState* state = image_view_->GetPageActionState();
-  if (state)
-    state->PaintBadge(canvas, gfx::Rect(width(), height()));
+  if (state) {
+    ExtensionActionState::PaintBadge(canvas, gfx::Rect(width(), height()),
+                                     state->badge_text(),
+                                     state->badge_text_color(),
+                                     state->badge_background_color());
+  }
 }
 
 void LocationBarView::PageActionWithBadgeView::UpdateVisibility(
     TabContents* contents, const GURL& url) {
   image_view_->UpdateVisibility(contents, url);
   SetVisible(image_view_->IsVisible());
 }
 
 
 // LocationBarView -----------------------------------------------------------
@@ skipping 1090 matching lines @@
 
 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()));
+  if (state) {
+    ExtensionActionState::PaintBadge(canvas, gfx::Rect(width(), height()),
+                                     state->badge_text(),
+                                     state->badge_text_color(),
+                                     state->badge_background_color());
+  }
 }
 
 // PageActionImageView----------------------------------------------------------
 
 LocationBarView::PageActionImageView::PageActionImageView(
     LocationBarView* owner,
     Profile* profile,
     const ExtensionAction* page_action,
     const BubblePositioner* bubble_positioner)
     : LocationBarImageView(bubble_positioner),
@@ skipping 145 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;
 }