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

Side by Side Diff: ui/views/controls/button/menu_button.h

Issue 10437006: Converts ui/views/controls, ui/views/examples, ui/base/models to ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 8 years, 7 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 #ifndef UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_ 5 #ifndef UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
6 #define UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_ 6 #define UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 20 matching lines...) Expand all
31 public: 31 public:
32 static const char kViewClassName[]; 32 static const char kViewClassName[];
33 33
34 // Create a Button. 34 // Create a Button.
35 MenuButton(ButtonListener* listener, 35 MenuButton(ButtonListener* listener,
36 const string16& text, 36 const string16& text,
37 MenuButtonListener* menu_button_listener, 37 MenuButtonListener* menu_button_listener,
38 bool show_menu_marker); 38 bool show_menu_marker);
39 virtual ~MenuButton(); 39 virtual ~MenuButton();
40 40
41 void set_menu_marker(const SkBitmap* menu_marker) { 41 void set_menu_marker(const gfx::ImageSkia* menu_marker) {
42 menu_marker_ = menu_marker; 42 menu_marker_ = menu_marker;
43 } 43 }
44 44
45 const gfx::Point& menu_offset() const { return menu_offset_; } 45 const gfx::Point& menu_offset() const { return menu_offset_; }
46 void set_menu_offset(int x, int y) { menu_offset_.SetPoint(x, y); } 46 void set_menu_offset(int x, int y) { menu_offset_.SetPoint(x, y); }
47 47
48 // Activate the button (called when the button is pressed). 48 // Activate the button (called when the button is pressed).
49 virtual bool Activate(); 49 virtual bool Activate();
50 50
51 // Overridden from TextButton for the potential use of a drop marker. 51 // Overridden from TextButton for the potential use of a drop marker.
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 base::Time menu_closed_time_; 84 base::Time menu_closed_time_;
85 85
86 // Our listener. Not owned. 86 // Our listener. Not owned.
87 MenuButtonListener* listener_; 87 MenuButtonListener* listener_;
88 88
89 // Whether or not we're showing a drop marker. 89 // Whether or not we're showing a drop marker.
90 bool show_menu_marker_; 90 bool show_menu_marker_;
91 91
92 // The down arrow used to differentiate the menu button from normal 92 // The down arrow used to differentiate the menu button from normal
93 // text buttons. 93 // text buttons.
94 const SkBitmap* menu_marker_; 94 const gfx::ImageSkia* menu_marker_;
95 95
96 // If non-null the destuctor sets this to true. This is set while the menu is 96 // If non-null the destuctor sets this to true. This is set while the menu is
97 // showing and used to detect if the menu was deleted while running. 97 // showing and used to detect if the menu was deleted while running.
98 bool* destroyed_flag_; 98 bool* destroyed_flag_;
99 99
100 DISALLOW_COPY_AND_ASSIGN(MenuButton); 100 DISALLOW_COPY_AND_ASSIGN(MenuButton);
101 }; 101 };
102 102
103 } // namespace views 103 } // namespace views
104 104
105 #endif // UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_ 105 #endif // UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698