diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-23 17:01:55 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-23 17:01:55 +0000 |
| commit | 1a2490c3e50dc17220981af077c005095af3606c (patch) | |
| tree | 8e5a14c8cb6c2a13cbabb934e8b40c16c4a03c79 /views/controls/scrollbar | |
| parent | 9486d9305f26d3ecb3b7d44029c756254e75b1f2 (diff) | |
| download | chromium_src-1a2490c3e50dc17220981af077c005095af3606c.zip chromium_src-1a2490c3e50dc17220981af077c005095af3606c.tar.gz chromium_src-1a2490c3e50dc17220981af077c005095af3606c.tar.bz2 | |
views: Pull out ContextMenuController class into its own header file.
BUG=72040
TEST=None
R=ben@chromium.org,sky@chromium.org
Review URL: http://codereview.chromium.org/7238006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90224 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/scrollbar')
| -rw-r--r-- | views/controls/scrollbar/bitmap_scroll_bar.cc | 8 | ||||
| -rw-r--r-- | views/controls/scrollbar/bitmap_scroll_bar.h | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/views/controls/scrollbar/bitmap_scroll_bar.cc b/views/controls/scrollbar/bitmap_scroll_bar.cc index 2785987..ca35cbe 100644 --- a/views/controls/scrollbar/bitmap_scroll_bar.cc +++ b/views/controls/scrollbar/bitmap_scroll_bar.cc @@ -299,10 +299,10 @@ BitmapScrollBar::BitmapScrollBar(bool horizontal, bool show_scroll_buttons) AddChildView(next_button_); AddChildView(thumb_); - SetContextMenuController(this); - prev_button_->SetContextMenuController(this); - next_button_->SetContextMenuController(this); - thumb_->SetContextMenuController(this); + set_context_menu_controller(this); + prev_button_->set_context_menu_controller(this); + next_button_->set_context_menu_controller(this); + thumb_->set_context_menu_controller(this); } gfx::Rect BitmapScrollBar::GetTrackBounds() const { diff --git a/views/controls/scrollbar/bitmap_scroll_bar.h b/views/controls/scrollbar/bitmap_scroll_bar.h index 833a045..ce072bf 100644 --- a/views/controls/scrollbar/bitmap_scroll_bar.h +++ b/views/controls/scrollbar/bitmap_scroll_bar.h @@ -6,6 +6,7 @@ #define VIEWS_CONTROLS_SCROLLBAR_BITMAP_SCROLL_BAR_H_ #pragma once +#include "views/context_menu_controller.h" #include "views/controls/button/image_button.h" #include "views/controls/menu/menu.h" #include "views/controls/scrollbar/scroll_bar.h" |