Now showing the browser action image (including badge) when dragging and...

chrome/browser/views/browser_actions_container.cc

 // Copyright (c) 2010 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 "app/slide_animation.h"
 #include "base/stl_util-inl.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/views/extensions/extension_popup.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.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/menu_button.h"
 #include "views/controls/button/text_button.h"
+#include "views/drag_utils.h"
 #include "views/window/window.h"
 
 #include "grit/theme_resources.h"
 
 // The size (both dimensions) of the buttons for page actions.
 static const int kButtonSize = 29;
 
 // The padding between the browser actions and the OmniBox/page menu.
 static const int kHorizontalPadding = 4;
 static const int kHorizontalPaddingRtl = 8;
@@ skipping 223 matching lines @@
 
 BrowserActionView::BrowserActionView(Extension* extension,
                                      BrowserActionsContainer* panel)
     : panel_(panel) {
   button_ = new BrowserActionButton(extension, panel);
   button_->SetDragController(panel_);
   AddChildView(button_);
   button_->UpdateState();
 }
 
+gfx::Canvas* BrowserActionView::GetIconWithBadge() {
+  int tab_id = panel_->GetCurrentTabId();
+
+  SkBitmap icon = button_->extension()->browser_action()->GetIcon(tab_id);
+  if (icon.isNull())
+    icon = button_->default_icon();
+
+  gfx::Canvas* canvas = new gfx::Canvas(icon.width(), icon.height(), false);
+  canvas->DrawBitmapInt(icon, 0, 0);
+
+  if (tab_id >= 0) {
+    gfx::Rect bounds =
+        gfx::Rect(icon.width(), icon.height() + kControlVertOffset);
+    button_->extension()->browser_action()->PaintBadge(canvas, bounds, tab_id);
+  }
+
+  return canvas;
+}
+
 void BrowserActionView::Layout() {
   button_->SetBounds(0, kControlVertOffset, width(), kButtonSize);
 }
 
 void BrowserActionView::PaintChildren(gfx::Canvas* canvas) {
   View::PaintChildren(canvas);
   ExtensionAction* action = button()->browser_action();
   int tab_id = panel_->GetCurrentTabId();
   if (tab_id < 0)
     return;
@@ skipping 538 matching lines @@
     overflow_menu_->set_observer(this);
     overflow_menu_->RunMenu(GetWindow()->GetNativeWindow(), false);
   }
 }
 
 void BrowserActionsContainer::WriteDragData(
     View* sender, int press_x, int press_y, OSExchangeData* data) {
   DCHECK(data);
 
   for (size_t i = 0; i < browser_action_views_.size(); ++i) {
-    if (browser_action_views_[i]->button() == sender) {
+    BrowserActionButton* button = browser_action_views_[i]->button();
+    if (button == sender) {
+      // Set the dragging image for the icon.
+      scoped_ptr<gfx::Canvas> canvas(
+          browser_action_views_[i]->GetIconWithBadge());
+      drag_utils::SetDragImageOnDataObject(*canvas, button->width(),
+          button->height(), press_x, press_y, data);
+      // Fill in the remaining info.

[Erik does not do reviews, 2010/02/05 01:16:24]

nit: newline above comment

       BrowserActionDragData drag_data(
           browser_action_views_[i]->button()->extension()->id(), i);
       drag_data.Write(profile_, data);
       break;
     }
   }
 }
 
 int BrowserActionsContainer::GetDragOperations(View* sender, int x, int y) {
   return DragDropTypes::DRAG_MOVE;
@@ skipping 210 matching lines @@
 
   profile_->GetPrefs()->SetInteger(prefs::kBrowserActionContainerWidth,
                                    container_size_.width());
 }
 
 void BrowserActionsContainer::NotifyMenuDeleted(
     BrowserActionOverflowMenuController* controller) {
   DCHECK(controller == overflow_menu_);
   overflow_menu_ = NULL;
 }