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

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: Win/Test Fix 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
« no previous file with comments | « chrome/browser/ui/views/toolbar/wrench_toolbar_button.h ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 // static
13 : views::MenuButton(NULL, base::string16(), listener, false) { 20 bool WrenchToolbarButton::g_open_wrench_immediately_for_testing = false;
14 wrench_icon_painter_.reset(new WrenchIconPainter(this)); 21
22 WrenchToolbarButton::WrenchToolbarButton(ToolbarView* toolbar_view)
23 : views::MenuButton(NULL, base::string16(), toolbar_view, false),
24 wrench_icon_painter_(new WrenchIconPainter(this)),
25 toolbar_view_(toolbar_view),
26 allow_extension_dragging_(
27 extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()),
28 weak_factory_(this) {
15 } 29 }
16 30
17 WrenchToolbarButton::~WrenchToolbarButton() { 31 WrenchToolbarButton::~WrenchToolbarButton() {
18 } 32 }
19 33
20 void WrenchToolbarButton::SetSeverity(WrenchIconPainter::Severity severity, 34 void WrenchToolbarButton::SetSeverity(WrenchIconPainter::Severity severity,
21 bool animate) { 35 bool animate) {
22 wrench_icon_painter_->SetSeverity(severity, animate); 36 wrench_icon_painter_->SetSeverity(severity, animate);
23 SchedulePaint(); 37 SchedulePaint();
24 } 38 }
25 39
26 gfx::Size WrenchToolbarButton::GetPreferredSize() const { 40 gfx::Size WrenchToolbarButton::GetPreferredSize() const {
27 return ResourceBundle::GetSharedInstance(). 41 return ResourceBundle::GetSharedInstance().
28 GetImageSkiaNamed(IDR_TOOLBAR_BEZEL_HOVER)->size(); 42 GetImageSkiaNamed(IDR_TOOLBAR_BEZEL_HOVER)->size();
29 } 43 }
30 44
31 void WrenchToolbarButton::OnPaint(gfx::Canvas* canvas) { 45 void WrenchToolbarButton::OnPaint(gfx::Canvas* canvas) {
32 views::MenuButton::OnPaint(canvas); 46 views::MenuButton::OnPaint(canvas);
33 wrench_icon_painter_->Paint(canvas, 47 wrench_icon_painter_->Paint(canvas,
34 GetThemeProvider(), 48 GetThemeProvider(),
35 gfx::Rect(size()), 49 gfx::Rect(size()),
36 WrenchIconPainter::BEZEL_NONE); 50 WrenchIconPainter::BEZEL_NONE);
37 } 51 }
38 52
39 void WrenchToolbarButton::ScheduleWrenchIconPaint() { 53 void WrenchToolbarButton::ScheduleWrenchIconPaint() {
40 SchedulePaint(); 54 SchedulePaint();
41 } 55 }
56
57 bool WrenchToolbarButton::GetDropFormats(
58 int* formats, std::set<ui::OSExchangeData::CustomFormat>* custom_formats) {
59 return allow_extension_dragging_ ?
60 BrowserActionDragData::GetDropFormats(custom_formats) :
61 views::View::GetDropFormats(formats, custom_formats);
62 }
63 bool WrenchToolbarButton::AreDropTypesRequired() {
64 return allow_extension_dragging_ ?
65 BrowserActionDragData::AreDropTypesRequired() :
66 views::View::AreDropTypesRequired();
67 }
68 bool WrenchToolbarButton::CanDrop(const ui::OSExchangeData& data) {
69 return allow_extension_dragging_ ?
70 BrowserActionDragData::CanDrop(data,
71 toolbar_view_->browser()->profile()) :
72 views::View::CanDrop(data);
73 }
74
75 void WrenchToolbarButton::OnDragEntered(const ui::DropTargetEvent& event) {
76 DCHECK(allow_extension_dragging_);
77 DCHECK(!weak_factory_.HasWeakPtrs());
78 if (!g_open_wrench_immediately_for_testing) {
79 base::MessageLoop::current()->PostDelayedTask(
80 FROM_HERE,
81 base::Bind(&WrenchToolbarButton::ShowOverflowMenu,
82 weak_factory_.GetWeakPtr()),
83 base::TimeDelta::FromMilliseconds(views::GetMenuShowDelay()));
84 } else {
85 ShowOverflowMenu();
86 }
87 }
88
89 int WrenchToolbarButton::OnDragUpdated(const ui::DropTargetEvent& event) {
90 DCHECK(allow_extension_dragging_);
91 return ui::DragDropTypes::DRAG_MOVE;
92 }
93
94 void WrenchToolbarButton::OnDragExited() {
95 DCHECK(allow_extension_dragging_);
96 weak_factory_.InvalidateWeakPtrs();
97 }
98
99 int WrenchToolbarButton::OnPerformDrop(const ui::DropTargetEvent& event) {
100 DCHECK(allow_extension_dragging_);
101 return ui::DragDropTypes::DRAG_MOVE;
102 }
103
104 void WrenchToolbarButton::ShowOverflowMenu() {
105 toolbar_view_->ShowAppMenu(true); // For drop.
106 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/wrench_toolbar_button.h ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698