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

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

Issue 298813002: views: Move MenuButton from TextButton to LabelButton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove stray LOG 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
OLDNEW
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"
11 #include "ui/base/resource/resource_bundle.h" 11 #include "ui/base/resource/resource_bundle.h"
12 #include "ui/gfx/canvas.h" 12 #include "ui/gfx/canvas.h"
13 #include "ui/gfx/image/image.h" 13 #include "ui/gfx/image/image.h"
14 #include "ui/views/controls/button/text_button.h" 14 #include "ui/views/controls/button/text_button.h"
15 #include "ui/views/drag_utils.h" 15 #include "ui/views/drag_utils.h"
16 #include "url/gurl.h" 16 #include "url/gurl.h"
17 17
18 namespace button_drag_utils { 18 namespace button_drag_utils {
19 19
20 // Maximum width of the link drag image in pixels. 20 // Maximum width of the link drag image in pixels.
21 static const int kLinkDragImageMaxWidth = 200; 21 static const int kLinkDragImageMaxWidth = 150;
msw 2014/06/09 17:18:40 Why are you changing this?
Elliot Glaysher 2014/06/11 00:27:28 As mentioned above, this is being set to BookmarkB
22 22
23 void SetURLAndDragImage(const GURL& url, 23 void SetURLAndDragImage(const GURL& url,
24 const base::string16& title, 24 const base::string16& title,
25 const gfx::ImageSkia& icon, 25 const gfx::ImageSkia& icon,
26 ui::OSExchangeData* data, 26 ui::OSExchangeData* data,
27 views::Widget* widget) { 27 views::Widget* widget) {
28 DCHECK(url.is_valid() && data); 28 DCHECK(url.is_valid() && data);
29 29
30 data->SetURL(url, title); 30 data->SetURL(url, title);
31 31
(...skipping 13 matching lines...) Expand all
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(*canvas, prefsize,
51 gfx::Vector2d(prefsize.width() / 2, prefsize.height() / 2), data); 51 gfx::Vector2d(prefsize.width() / 2, prefsize.height() / 2), data);
52 } 52 }
53 53
54 } // namespace button_drag_utils 54 } // namespace button_drag_utils
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698