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

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

Issue 413323002: Resubmit: Open the WrenchMenu on mouseover when dragging a browser action (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_TOOLBAR_BUTTON_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_TOOLBAR_BUTTON_H_
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_TOOLBAR_BUTTON_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_TOOLBAR_BUTTON_H_
7 7
8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h"
8 #include "chrome/browser/ui/toolbar/wrench_icon_painter.h" 11 #include "chrome/browser/ui/toolbar/wrench_icon_painter.h"
9 #include "ui/views/controls/button/menu_button.h" 12 #include "ui/views/controls/button/menu_button.h"
10 13
14 class ToolbarView;
15
11 // TODO(gbillock): Rename this? No longer a wrench. 16 // TODO(gbillock): Rename this? No longer a wrench.
12 class WrenchToolbarButton : public views::MenuButton, 17 class WrenchToolbarButton : public views::MenuButton,
13 public WrenchIconPainter::Delegate { 18 public WrenchIconPainter::Delegate {
14 public: 19 public:
15 explicit WrenchToolbarButton(views::MenuButtonListener* menu_button_listener); 20 explicit WrenchToolbarButton(ToolbarView* toolbar_view);
16 virtual ~WrenchToolbarButton(); 21 virtual ~WrenchToolbarButton();
17 22
18 void SetSeverity(WrenchIconPainter::Severity severity, bool animate); 23 void SetSeverity(WrenchIconPainter::Severity severity, bool animate);
19 24
20 // views::MenuButton: 25 // views::MenuButton:
21 virtual gfx::Size GetPreferredSize() const OVERRIDE; 26 virtual gfx::Size GetPreferredSize() const OVERRIDE;
22 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 27 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
23 28
24 // WrenchIconPainter::Delegate: 29 // WrenchIconPainter::Delegate:
25 virtual void ScheduleWrenchIconPaint() OVERRIDE; 30 virtual void ScheduleWrenchIconPaint() OVERRIDE;
26 31
32 // Opens the wrench menu immediately during a drag-and-drop operation.
33 // Used only in testing.
34 static bool g_open_wrench_immediately_for_testing;
35
27 private: 36 private:
37 // views::View:
38 virtual bool GetDropFormats(int* formats,
39 std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
40 virtual bool AreDropTypesRequired() OVERRIDE;
41 virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE;
42 virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE;
43 virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE;
44 virtual void OnDragExited() OVERRIDE;
45 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE;
46
47 // Show the extension action overflow menu (which is in the app menu).
48 void ShowOverflowMenu();
49
28 scoped_ptr<WrenchIconPainter> wrench_icon_painter_; 50 scoped_ptr<WrenchIconPainter> wrench_icon_painter_;
29 51
52 // Our owning toolbar view.
53 ToolbarView* toolbar_view_;
54
55 // Whether or not we should allow dragging extension icons onto this button
56 // (in order to open the overflow in the app/wrench menu).
57 bool allow_extension_dragging_;
58
59 // Used to spawn weak pointers for delayed tasks to open the overflow menu.
60 base::WeakPtrFactory<WrenchToolbarButton> weak_factory_;
61
30 DISALLOW_COPY_AND_ASSIGN(WrenchToolbarButton); 62 DISALLOW_COPY_AND_ASSIGN(WrenchToolbarButton);
31 }; 63 };
32 64
33 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_TOOLBAR_BUTTON_H_ 65 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_TOOLBAR_BUTTON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698