| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_ | 5 #ifndef VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_ |
| 6 #define VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_ | 6 #define VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/time.h" | 10 #include "base/time.h" |
| 11 #include "gfx/font.h" | 11 #include "gfx/font.h" |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 // The associated menu's resource identifier. | 90 // The associated menu's resource identifier. |
| 91 ViewMenuDelegate* menu_delegate_; | 91 ViewMenuDelegate* menu_delegate_; |
| 92 | 92 |
| 93 // Whether or not we're showing a drop marker. | 93 // Whether or not we're showing a drop marker. |
| 94 bool show_menu_marker_; | 94 bool show_menu_marker_; |
| 95 | 95 |
| 96 // The down arrow used to differentiate the menu button from normal | 96 // The down arrow used to differentiate the menu button from normal |
| 97 // text buttons. | 97 // text buttons. |
| 98 const SkBitmap* menu_marker_; | 98 const SkBitmap* menu_marker_; |
| 99 | 99 |
| 100 // If non-null the destuctor sets this to true. This is set while the menu is |
| 101 // showing and used to detect if the menu was deleted while running. |
| 102 bool* destroyed_flag_; |
| 103 |
| 100 DISALLOW_COPY_AND_ASSIGN(MenuButton); | 104 DISALLOW_COPY_AND_ASSIGN(MenuButton); |
| 101 }; | 105 }; |
| 102 | 106 |
| 103 } // namespace views | 107 } // namespace views |
| 104 | 108 |
| 105 #endif // VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_ | 109 #endif // VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_ |
| OLD | NEW |