summaryrefslogtreecommitdiffstats
path: root/views/controls/textfield
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 04:57:58 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 04:57:58 +0000
commit0933ab808b0245878803552b9908c720b0faf1d1 (patch)
tree99d088873b45c8295af71287b3ad2865e141bf59 /views/controls/textfield
parenteb8a06d3f439f3be31a5a0dcbcdd86160c50cbb7 (diff)
downloadchromium_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/textfield')
-rw-r--r--views/controls/textfield/native_textfield_views.cc6
-rw-r--r--views/controls/textfield/native_textfield_views.h6
2 files changed, 6 insertions, 6 deletions
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;