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

Side by Side Diff: chrome/browser/ui/views/toolbar/wrench_toolbar_button.cc

Issue 399143004: Open the WrenchMenu on mouseover when dragging a browser action (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix for drag/drop not in menu Created 6 years, 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" 5 #include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h"
6 6
7 #include "base/message_loop/message_loop.h"
8 #include "base/time/time.h"
9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"
11 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
12 #include "extensions/common/feature_switch.h"
7 #include "grit/theme_resources.h" 13 #include "grit/theme_resources.h"
8 #include "ui/base/resource/resource_bundle.h" 14 #include "ui/base/resource/resource_bundle.h"
9 #include "ui/base/theme_provider.h" 15 #include "ui/base/theme_provider.h"
16 #include "ui/views/metrics.h"
10 #include "ui/views/painter.h" 17 #include "ui/views/painter.h"
11 18
12 WrenchToolbarButton::WrenchToolbarButton(views::MenuButtonListener* listener) 19 WrenchToolbarButton::WrenchToolbarButton(ToolbarView* toolbar_view)
13 : views::MenuButton(NULL, base::string16(), listener, false) { 20 : views::MenuButton(NULL, base::string16(), toolbar_view, false),
14 wrench_icon_painter_.reset(new WrenchIconPainter(this)); 21 wrench_icon_painter_(new WrenchIconPainter(this)),
22 toolbar_view_(toolbar_view),
23 allow_extension_dragging_(
24 extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()),
25 weak_factory_(this) {
15 } 26 }
16 27
17 WrenchToolbarButton::~WrenchToolbarButton() { 28 WrenchToolbarButton::~WrenchToolbarButton() {
18 } 29 }
19 30
20 void WrenchToolbarButton::SetSeverity(WrenchIconPainter::Severity severity, 31 void WrenchToolbarButton::SetSeverity(WrenchIconPainter::Severity severity,
21 bool animate) { 32 bool animate) {
22 wrench_icon_painter_->SetSeverity(severity, animate); 33 wrench_icon_painter_->SetSeverity(severity, animate);
23 } 34 }
24 35
25 gfx::Size WrenchToolbarButton::GetPreferredSize() const { 36 gfx::Size WrenchToolbarButton::GetPreferredSize() const {
26 return ResourceBundle::GetSharedInstance(). 37 return ResourceBundle::GetSharedInstance().
27 GetImageSkiaNamed(IDR_TOOLBAR_BEZEL_HOVER)->size(); 38 GetImageSkiaNamed(IDR_TOOLBAR_BEZEL_HOVER)->size();
28 } 39 }
29 40
30 void WrenchToolbarButton::OnPaint(gfx::Canvas* canvas) { 41 void WrenchToolbarButton::OnPaint(gfx::Canvas* canvas) {
31 views::MenuButton::OnPaint(canvas); 42 views::MenuButton::OnPaint(canvas);
32 wrench_icon_painter_->Paint(canvas, 43 wrench_icon_painter_->Paint(canvas,
33 GetThemeProvider(), 44 GetThemeProvider(),
34 gfx::Rect(size()), 45 gfx::Rect(size()),
35 WrenchIconPainter::BEZEL_NONE); 46 WrenchIconPainter::BEZEL_NONE);
36 } 47 }
37 48
38 void WrenchToolbarButton::ScheduleWrenchIconPaint() { 49 void WrenchToolbarButton::ScheduleWrenchIconPaint() {
39 SchedulePaint(); 50 SchedulePaint();
40 } 51 }
52
53 bool WrenchToolbarButton::GetDropFormats(
54 int* formats, std::set<ui::OSExchangeData::CustomFormat>* custom_formats) {
55 return allow_extension_dragging_ ?
56 BrowserActionDragData::GetDropFormats(custom_formats) :
57 views::View::GetDropFormats(formats, custom_formats);
58 }
59 bool WrenchToolbarButton::AreDropTypesRequired() {
60 return allow_extension_dragging_ ?
61 BrowserActionDragData::AreDropTypesRequired() :
62 views::View::AreDropTypesRequired();
63 }
64 bool WrenchToolbarButton::CanDrop(const ui::OSExchangeData& data) {
65 return allow_extension_dragging_ ?
66 BrowserActionDragData::CanDrop(data,
67 toolbar_view_->browser()->profile()) :
68 views::View::CanDrop(data);
69 }
70
71 void WrenchToolbarButton::OnDragEntered(const ui::DropTargetEvent& event) {
72 DCHECK(allow_extension_dragging_);
73 DCHECK(!weak_factory_.HasWeakPtrs());
74 base::MessageLoop::current()->PostDelayedTask(
75 FROM_HERE,
76 base::Bind(&WrenchToolbarButton::ShowOverflowMenu,
77 weak_factory_.GetWeakPtr()),
78 base::TimeDelta::FromMilliseconds(views::GetMenuShowDelay()));
79 }
80
81 int WrenchToolbarButton::OnDragUpdated(const ui::DropTargetEvent& event) {
82 DCHECK(allow_extension_dragging_);
83 return ui::DragDropTypes::DRAG_MOVE;
84 }
85
86 void WrenchToolbarButton::OnDragExited() {
87 DCHECK(allow_extension_dragging_);
88 weak_factory_.InvalidateWeakPtrs();
89 }
90
91 int WrenchToolbarButton::OnPerformDrop(const ui::DropTargetEvent& event) {
92 DCHECK(allow_extension_dragging_);
93 return ui::DragDropTypes::DRAG_MOVE;
94 }
95
96 void WrenchToolbarButton::ShowOverflowMenu() {
97 toolbar_view_->ShowAppMenu(true); // For drop.
98 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698