| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_MENU_MENU_SCROLL_VIEW_CONTAINER_H_ | 5 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_SCROLL_VIEW_CONTAINER_H_ |
| 6 #define UI_VIEWS_CONTROLS_MENU_MENU_SCROLL_VIEW_CONTAINER_H_ | 6 #define UI_VIEWS_CONTROLS_MENU_MENU_SCROLL_VIEW_CONTAINER_H_ |
| 7 | 7 |
| 8 #include "ui/views/view.h" | 8 #include "base/macros.h" |
| 9 #include "ui/views/bubble/bubble_border.h" | 9 #include "ui/views/bubble/bubble_border.h" |
| 10 #include "ui/views/controls/menu/menu_types.h" | 10 #include "ui/views/controls/menu/menu_types.h" |
| 11 #include "ui/views/view.h" |
| 11 | 12 |
| 12 namespace views { | 13 namespace views { |
| 13 | 14 |
| 14 class SubmenuView; | 15 class SubmenuView; |
| 15 | 16 |
| 16 // MenuScrollViewContainer contains the SubmenuView (through a MenuScrollView) | 17 // MenuScrollViewContainer contains the SubmenuView (through a MenuScrollView) |
| 17 // and two scroll buttons. The scroll buttons are only visible and enabled if | 18 // and two scroll buttons. The scroll buttons are only visible and enabled if |
| 18 // the preferred height of the SubmenuView is bigger than our bounds. | 19 // the preferred height of the SubmenuView is bigger than our bounds. |
| 19 class MenuScrollViewContainer : public View { | 20 class MenuScrollViewContainer : public View { |
| 20 public: | 21 public: |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 | 68 |
| 68 // Weak reference to the currently set border. | 69 // Weak reference to the currently set border. |
| 69 BubbleBorder* bubble_border_; | 70 BubbleBorder* bubble_border_; |
| 70 | 71 |
| 71 DISALLOW_COPY_AND_ASSIGN(MenuScrollViewContainer); | 72 DISALLOW_COPY_AND_ASSIGN(MenuScrollViewContainer); |
| 72 }; | 73 }; |
| 73 | 74 |
| 74 } // namespace views | 75 } // namespace views |
| 75 | 76 |
| 76 #endif // UI_VIEWS_CONTROLS_MENU_MENU_SCROLL_VIEW_CONTAINER_H_ | 77 #endif // UI_VIEWS_CONTROLS_MENU_MENU_SCROLL_VIEW_CONTAINER_H_ |
| OLD | NEW |