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

chrome/browser/gtk/location_bar_view_gtk.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/gtk/location_bar_view_gtk.h"
 
 #include <string>
 
+#include "app/gfx/canvas_paint.h"
 #include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/alternate_nav_url_fetcher.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h"
 #include "chrome/browser/browser.h"
@@ skipping 658 matching lines @@
     : owner_(owner),
       profile_(profile),
       page_action_(page_action),
       last_icon_skbitmap_(NULL),
       last_icon_pixbuf_(NULL) {
   event_box_.Own(gtk_event_box_new());
   // Make the event box not visible so it does not paint a background.
   gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box_.get()), FALSE);
   g_signal_connect(event_box_.get(), "button-press-event",
                    G_CALLBACK(&OnButtonPressed), this);
+  g_signal_connect_after(event_box_.get(), "expose-event",
+                         G_CALLBACK(OnExposeEvent), this);
 
   image_.Own(gtk_image_new());
   gtk_container_add(GTK_CONTAINER(event_box_.get()), image_.get());
 
   Extension* extension = profile->GetExtensionsService()->GetExtensionById(
       page_action->extension_id());
   DCHECK(extension);
 
   DCHECK(!page_action->icon_paths().empty());
   const std::vector<std::string>& icon_paths = page_action->icon_paths();
@@ skipping 89 matching lines @@
     LocationBarViewGtk::PageActionViewGtk* page_action_view) {
   ExtensionBrowserEventRouter::GetInstance()->PageActionExecuted(
       page_action_view->profile_,
       page_action_view->page_action_->extension_id(),
       page_action_view->page_action_->id(),
       page_action_view->current_tab_id_,
       page_action_view->current_url_.spec(),
       event->button);
   return true;
 }
+
+// static
+gboolean LocationBarViewGtk::PageActionViewGtk::OnExposeEvent(
+    GtkWidget* widget, GdkEventExpose* event, PageActionViewGtk* view) {
+  TabContents* contents = view->owner_->browser_->GetSelectedTabContents();
+  if (!contents)
+    return FALSE;
+  const ExtensionActionState* state =
+      contents->GetPageActionState(view->page_action_);
+  if (!state || state->badge_text().empty())
+    return FALSE;
+
+  gfx::CanvasPaint canvas(event, false);
+  gfx::Rect bounding_rect(widget->allocation);
+  state->PaintBadge(&canvas, bounding_rect);
+  return FALSE;
+}