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

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

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years 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 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 16 matching lines...) Expand all
27 class VIEWS_EXPORT MenuButton : public TextButton { 27 class VIEWS_EXPORT MenuButton : public TextButton {
28 public: 28 public:
29 static const char kViewClassName[]; 29 static const char kViewClassName[];
30 30
31 // How much padding to put on the left and right of the menu marker. 31 // How much padding to put on the left and right of the menu marker.
32 static const int kMenuMarkerPaddingLeft; 32 static const int kMenuMarkerPaddingLeft;
33 static const int kMenuMarkerPaddingRight; 33 static const int kMenuMarkerPaddingRight;
34 34
35 // Create a Button. 35 // Create a Button.
36 MenuButton(ButtonListener* listener, 36 MenuButton(ButtonListener* listener,
37 const string16& text, 37 const base::string16& text,
38 MenuButtonListener* menu_button_listener, 38 MenuButtonListener* menu_button_listener,
39 bool show_menu_marker); 39 bool show_menu_marker);
40 virtual ~MenuButton(); 40 virtual ~MenuButton();
41 41
42 bool show_menu_marker() const { return show_menu_marker_; } 42 bool show_menu_marker() const { return show_menu_marker_; }
43 void set_menu_marker(const gfx::ImageSkia* menu_marker) { 43 void set_menu_marker(const gfx::ImageSkia* menu_marker) {
44 menu_marker_ = menu_marker; 44 menu_marker_ = menu_marker;
45 } 45 }
46 const gfx::ImageSkia* menu_marker() const { return menu_marker_; } 46 const gfx::ImageSkia* menu_marker() const { return menu_marker_; }
47 47
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 // If non-null the destuctor sets this to true. This is set while the menu is 103 // If non-null the destuctor sets this to true. This is set while the menu is
104 // showing and used to detect if the menu was deleted while running. 104 // showing and used to detect if the menu was deleted while running.
105 bool* destroyed_flag_; 105 bool* destroyed_flag_;
106 106
107 DISALLOW_COPY_AND_ASSIGN(MenuButton); 107 DISALLOW_COPY_AND_ASSIGN(MenuButton);
108 }; 108 };
109 109
110 } // namespace views 110 } // namespace views
111 111
112 #endif // UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_ 112 #endif // UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
OLDNEW
« no previous file with comments | « ui/views/controls/button/label_button_unittest.cc ('k') | ui/views/controls/button/menu_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698