ui/views/button_drag_utils.cc - Issue 328993002: Ensure that the size passed down to the SetDragImageOnDataObject function called from drag_utils::S…

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ui/views/button_drag_utils.cc

Issue 328993002: Ensure that the size passed down to the SetDragImageOnDataObject function called from drag_utils::S… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Removed parentheses and fixed alignment Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « ui/base/dragdrop/drag_utils_win.cc ('k') | ui/views/controls/menu/menu_controller.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ui/views/button_drag_utils.h"	5 #include "ui/views/button_drag_utils.h"

6	6

7 #include "base/strings/utf_string_conversions.h"	7 #include "base/strings/utf_string_conversions.h"

8 #include "grit/ui_resources.h"	8 #include "grit/ui_resources.h"

9 #include "ui/base/dragdrop/drag_utils.h"	9 #include "ui/base/dragdrop/drag_utils.h"

10 #include "ui/base/dragdrop/os_exchange_data.h"	10 #include "ui/base/dragdrop/os_exchange_data.h"

(...skipping 29 matching lines...) Expand all Loading...
40 } else {	40 } else {

41 button.SetIcon(icon);	41 button.SetIcon(icon);

42 }	42 }

43 gfx::Size prefsize = button.GetPreferredSize();	43 gfx::Size prefsize = button.GetPreferredSize();

44 button.SetBounds(0, 0, prefsize.width(), prefsize.height());	44 button.SetBounds(0, 0, prefsize.width(), prefsize.height());

45	45

46 // Render the image.	46 // Render the image.

47 scoped_ptr<gfx::Canvas> canvas(	47 scoped_ptr<gfx::Canvas> canvas(

48 views::GetCanvasForDragImage(widget, prefsize));	48 views::GetCanvasForDragImage(widget, prefsize));

49 button.PaintButton(canvas.get(), views::TextButton::PB_FOR_DRAG);	49 button.PaintButton(canvas.get(), views::TextButton::PB_FOR_DRAG);

50 drag_utils::SetDragImageOnDataObject(*canvas, prefsize,	50 drag_utils::SetDragImageOnDataObject(

51 gfx::Vector2d(prefsize.width() / 2, prefsize.height() / 2), data);	51 *canvas,

	52 gfx::Vector2d(prefsize.width() / 2, prefsize.height() / 2),

	53 data);

52 }	54 }

53	55

54 } // namespace button_drag_utils	56 } // namespace button_drag_utils

OLD	NEW