diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 04:57:58 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 04:57:58 +0000 |
| commit | 0933ab808b0245878803552b9908c720b0faf1d1 (patch) | |
| tree | 99d088873b45c8295af71287b3ad2865e141bf59 /views/controls | |
| parent | eb8a06d3f439f3be31a5a0dcbcdd86160c50cbb7 (diff) | |
| download | chromium_src-0933ab808b0245878803552b9908c720b0faf1d1.zip chromium_src-0933ab808b0245878803552b9908c720b0faf1d1.tar.gz chromium_src-0933ab808b0245878803552b9908c720b0faf1d1.tar.bz2 | |
Rename ContextMenuController::ShowContextMenu() to ShowContextMenuForView().
For classes deriving from both View and ContextMenuController, this
makes it clear which of method is overridden.
Rename TabController::ShowContextMenu to ShowContextMenuForTab for the same reason.
No intended functionality change.
BUG=70465,72205
TEST=none
TBR=beng
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/scrollbar/bitmap_scroll_bar.cc | 6 | ||||
| -rw-r--r-- | views/controls/scrollbar/bitmap_scroll_bar.h | 6 | ||||
| -rw-r--r-- | views/controls/textfield/native_textfield_views.cc | 6 | ||||
| -rw-r--r-- | views/controls/textfield/native_textfield_views.h | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/views/controls/scrollbar/bitmap_scroll_bar.cc b/views/controls/scrollbar/bitmap_scroll_bar.cc index e3bfca8..d41c332 100644 --- a/views/controls/scrollbar/bitmap_scroll_bar.cc +++ b/views/controls/scrollbar/bitmap_scroll_bar.cc @@ -547,9 +547,9 @@ enum ScrollBarContextMenuCommands { ScrollBarContextMenuCommand_ScrollNext }; -void BitmapScrollBar::ShowContextMenu(View* source, - const gfx::Point& p, - bool is_mouse_gesture) { +void BitmapScrollBar::ShowContextMenuForView(View* source, + const gfx::Point& p, + bool is_mouse_gesture) { Widget* widget = GetWidget(); gfx::Rect widget_bounds = widget->GetWindowScreenBounds(); gfx::Point temp_pt(p.x() - widget_bounds.x(), p.y() - widget_bounds.y()); diff --git a/views/controls/scrollbar/bitmap_scroll_bar.h b/views/controls/scrollbar/bitmap_scroll_bar.h index 07667d1..d0138b4 100644 --- a/views/controls/scrollbar/bitmap_scroll_bar.h +++ b/views/controls/scrollbar/bitmap_scroll_bar.h @@ -114,9 +114,9 @@ class BitmapScrollBar : public ScrollBar, virtual int GetPosition() const; // ContextMenuController overrides. - virtual void ShowContextMenu(View* source, - const gfx::Point& p, - bool is_mouse_gesture); + virtual void ShowContextMenuForView(View* source, + const gfx::Point& p, + bool is_mouse_gesture); // Menu::Delegate overrides: virtual std::wstring GetLabel(int id) const; diff --git a/views/controls/textfield/native_textfield_views.cc b/views/controls/textfield/native_textfield_views.cc index 21313a0..4950ebe 100644 --- a/views/controls/textfield/native_textfield_views.cc +++ b/views/controls/textfield/native_textfield_views.cc @@ -147,9 +147,9 @@ gfx::NativeCursor NativeTextfieldViews::GetCursorForPoint( ///////////////////////////////////////////////////////////////// // NativeTextfieldViews, views::ContextMenuController overrides: -void NativeTextfieldViews::ShowContextMenu(View* source, - const gfx::Point& p, - bool is_mouse_gesture) { +void NativeTextfieldViews::ShowContextMenuForView(View* source, + const gfx::Point& p, + bool is_mouse_gesture) { InitContextMenuIfRequired(); context_menu_menu_->RunContextMenuAt(p); } diff --git a/views/controls/textfield/native_textfield_views.h b/views/controls/textfield/native_textfield_views.h index 89484dc..488551d 100644 --- a/views/controls/textfield/native_textfield_views.h +++ b/views/controls/textfield/native_textfield_views.h @@ -61,9 +61,9 @@ class NativeTextfieldViews : public views::View, const gfx::Point& p) OVERRIDE; // views::ContextMenuController overrides: - virtual void ShowContextMenu(View* source, - const gfx::Point& p, - bool is_mouse_gesture) OVERRIDE; + virtual void ShowContextMenuForView(View* source, + const gfx::Point& p, + bool is_mouse_gesture) OVERRIDE; // NativeTextfieldWrapper overrides: virtual string16 GetText() const OVERRIDE; |