Merge 29556 - Revert "Revert 29457, because this is making ExtensionBrowserTe...

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 1154 matching lines @@
 }
 
 void LocationBarView::SecurityImageView::ShowInfoBubble() {
   std::wstring text;
   model_->GetIconHoverText(&text);
   ShowInfoBubbleImpl(text, GetColor(
       model_->GetSecurityLevel() == ToolbarModel::SECURE,
       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(
     LocationBarView* owner,
     Profile* profile,
     const ExtensionAction* page_action,
     const BubblePositioner* bubble_positioner)
     : LocationBarImageView(bubble_positioner),
       owner_(owner),
       profile_(profile),
@@ skipping 134 matching lines @@
 }
 
 int LocationBarView::PageActionVisibleCount() {
   int result = 0;
   for (size_t i = 0; i < page_action_image_views_.size(); i++) {
     if (page_action_image_views_[i]->IsVisible())
       ++result;
   }
   return result;
 }