Merge 29509 - Revert 29457, because this is making ExtensionBrowserTest.PageA...

chrome/browser/views/location_bar_view.cc

Index: chrome/browser/views/location_bar_view.cc
===================================================================
--- chrome/browser/views/location_bar_view.cc	(revision 29821)
+++ chrome/browser/views/location_bar_view.cc	(working copy)
@@ -1172,18 +1172,6 @@
       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_);
-  state->PaintBadge(canvas, gfx::Rect(width(), height()));
-}
-
 // PageActionImageView----------------------------------------------------------
 
 LocationBarView::PageActionImageView::PageActionImageView(
Property changes on: chrome\browser\views\location_bar_view.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/src/chrome/browser/views/location_bar_view.cc:r29509
   Merged /branches/chrome_webkit_merge_branch/chrome/browser/views/location_bar_view.cc:r69-2775