Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9350)

Unified Diff: chrome/browser/ui/views/toolbar/browser_actions_container.cc

Issue 2792183002: Delete ash-based code for Windows drag-and-drop graphics. (Closed)
Patch Set: ashdrag: addheaders Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/toolbar/browser_actions_container.cc
diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container.cc b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
index 4b6ae91e3c871cb2671ec13b9b10d9bba33edf35..f2f57fde20840666b257fb63c01a9f71803c124d 100644
--- a/chrome/browser/ui/views/toolbar/browser_actions_container.cc
+++ b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
@@ -29,7 +29,6 @@
#include "extensions/common/feature_switch.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/accessibility/ax_node_data.h"
-#include "ui/base/dragdrop/drag_utils.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/nine_image_painter_factory.h"
#include "ui/base/resource/resource_bundle.h"
@@ -522,10 +521,9 @@ void BrowserActionsContainer::WriteDragDataForView(View* sender,
ToolbarActionViewController* view_controller = (*it)->view_controller();
gfx::Size size(ToolbarActionsBar::IconWidth(false),
ToolbarActionsBar::IconHeight());
- drag_utils::SetDragImageOnDataObject(
+ data->provider().SetDragImage(
view_controller->GetIcon(GetCurrentWebContents(), size).AsImageSkia(),
- press_pt.OffsetFromOrigin(),
- data);
+ press_pt.OffsetFromOrigin());
// Fill in the remaining info.
BrowserActionDragData drag_data(view_controller->GetId(),
it - toolbar_action_views_.cbegin());

Powered by Google App Engine
This is Rietveld 408576698