Move page actions over to ExtensionAction2

chrome/browser/gtk/browser_actions_toolbar_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/browser_actions_toolbar_gtk.h"
 
 #include <gtk/gtk.h>
 #include <vector>
 
 #include "app/gfx/canvas_paint.h"
@@ skipping 35 matching lines @@
         tab_specific_icon_(NULL),
         default_icon_(NULL) {
     DCHECK(extension_->browser_action());
 
     gtk_widget_set_size_request(button_.get(), kButtonSize, kButtonSize);
 
     UpdateState();
 
     // The Browser Action API does not allow the default icon path to be
     // changed at runtime, so we can load this now and cache it.
-    std::string path = extension_->browser_action()->GetDefaultIconPath();
+    std::string path = extension_->browser_action()->default_icon_path();
     if (!path.empty()) {
       tracker_ = new ImageLoadingTracker(this, 1);
       tracker_->PostLoadImageTask(extension_->GetResource(path),
           gfx::Size(Extension::kBrowserActionIconMaxSize,
                     Extension::kBrowserActionIconMaxSize));
     }
 
     // We need to hook up extension popups here. http://crbug.com/23897
     g_signal_connect(button_.get(), "clicked",
                      G_CALLBACK(OnButtonClicked), this);
@@ skipping 29 matching lines @@
     if (type == NotificationType::EXTENSION_BROWSER_ACTION_UPDATED)
       UpdateState();
     else if (type == NotificationType::BROWSER_THEME_CHANGED)
       OnThemeChanged();
     else
       NOTREACHED();
   }
 
   // ImageLoadingTracker::Observer implementation.
   void OnImageLoaded(SkBitmap* image, size_t index) {
-    default_icon_ = gfx::GdkPixbufFromSkBitmap(image);
+    if (image)
+      default_icon_ = gfx::GdkPixbufFromSkBitmap(image);
     UpdateState();
   }
 
   // Updates the button based on the latest state from the associated
   // browser action.
   void UpdateState() {
     int tab_id = toolbar_->GetCurrentTabId();
     if (tab_id < 0)
       return;
 
@@ skipping 43 matching lines @@
     int tab_id = button->toolbar_->GetCurrentTabId();
     if (tab_id < 0)
       return FALSE;
 
     ExtensionAction2* action = button->extension_->browser_action();
     if (action->GetBadgeText(tab_id).empty())
       return FALSE;
 
     gfx::CanvasPaint canvas(event, false);
     gfx::Rect bounding_rect(widget->allocation);
-    ExtensionActionState::PaintBadge(&canvas, bounding_rect,
-                                     action->GetBadgeText(tab_id),
-                                     action->GetBadgeTextColor(tab_id),
-                                     action->GetBadgeBackgroundColor(tab_id));
+    action->PaintBadge(&canvas, bounding_rect, tab_id);
     return FALSE;
   }
 
   // The toolbar containing this button.
   BrowserActionsToolbarGtk* toolbar_;
 
   // The extension that contains this browser action.
   Extension* extension_;
 
   // The gtk widget for this browser action.
@@ skipping 91 matching lines @@
   if (extension_button_map_.erase(extension->id()))
     UpdateVisibility();
 }
 
 void BrowserActionsToolbarGtk::UpdateVisibility() {
   if (button_count() == 0)
     gtk_widget_hide(widget());
   else
     gtk_widget_show(widget());
 }