Move page actions over to ExtensionAction2

chrome/browser/views/browser_actions_container.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/browser_actions_container.h"
 
 #include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/extensions/extension_popup.h"
 #include "chrome/browser/views/toolbar_view.h"
-#include "chrome/common/extensions/extension_action.h"
-#include "chrome/common/extensions/extension_action2.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "grit/app_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "views/controls/button/text_button.h"
 
 // The size (both dimensions) of the buttons for page actions.
 static const int kButtonSize = 29;
@@ skipping 49 matching lines @@
 
 void BrowserActionButton::ButtonPressed(
     views::Button* sender, const views::Event& event) {
   panel_->OnBrowserActionExecuted(this);
 }
 
 void BrowserActionButton::LoadImage() {
   // Load the default image from the browser action asynchronously on the file
   // thread. We'll get a call back into OnImageLoaded if the image loads
   // successfully.
-  std::string relative_path = browser_action()->GetDefaultIconPath();
+  std::string relative_path = browser_action()->default_icon_path();
   if (relative_path.empty())
     return;
 
   tracker_ = new ImageLoadingTracker(this, 1);
   tracker_->PostLoadImageTask(
       extension()->GetResource(relative_path),
       gfx::Size(Extension::kBrowserActionIconMaxSize,
                 Extension::kBrowserActionIconMaxSize));
 }
 
 void BrowserActionButton::OnImageLoaded(SkBitmap* image, size_t index) {
-  SetIcon(*image);
+  if (image)
+    SetIcon(*image);
   tracker_ = NULL;  // The tracker object will delete itself when we return.
   GetParent()->SchedulePaint();
 }
 
 void BrowserActionButton::UpdateState() {
   int tab_id = panel_->GetCurrentTabId();
   if (tab_id < 0)
     return;
 
   SkBitmap image = browser_action()->GetIcon(tab_id);
@@ skipping 92 matching lines @@
   button_->SetBounds(0, kControlVertOffset, width(), kButtonSize);
 }
 
 void BrowserActionView::PaintChildren(gfx::Canvas* canvas) {
   View::PaintChildren(canvas);
   ExtensionAction2* action = button()->browser_action();
   int tab_id = panel_->GetCurrentTabId();
   if (tab_id < 0)
     return;
 
-  ExtensionActionState::PaintBadge(
-    canvas, gfx::Rect(width(), height()),
-    action->GetBadgeText(tab_id),
-    action->GetBadgeTextColor(tab_id),
-    action->GetBadgeBackgroundColor(tab_id));
+  action->PaintBadge(canvas, gfx::Rect(width(), height()), tab_id);
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserActionsContainer
 
 BrowserActionsContainer::BrowserActionsContainer(
     Profile* profile, ToolbarView* toolbar)
     : profile_(profile),
       toolbar_(toolbar),
@@ skipping 228 matching lines @@
       std::min(static_cast<int>(browser_action_views_.size()),
                kMinimumNumberOfVisibleBrowserActions) * kButtonSize;
 
   // Even if available_width is <= 0, we still return at least the |min_width|.
   if (available_width <= 0)
     return min_width;
 
   return std::max(min_width, available_width - available_width % kButtonSize +
                   kHorizontalPadding * 2);
 }