summaryrefslogtreecommitdiffstats
path: root/views/controls/native
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-24 00:59:52 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-24 00:59:52 +0000
commit420138333ca7e2a5f6e5738a43f3780c98a03d42 (patch)
tree674b8f714ed45aa5f98a9e827f98bb49bcc92ba0 /views/controls/native
parent901944666724e9e8df190aaf26bed6c6cda3ade4 (diff)
downloadchromium_src-420138333ca7e2a5f6e5738a43f3780c98a03d42.zip
chromium_src-420138333ca7e2a5f6e5738a43f3780c98a03d42.tar.gz
chromium_src-420138333ca7e2a5f6e5738a43f3780c98a03d42.tar.bz2
Rename WillGain/Lose/DidGainFocus, Focus methods. Now there are only two notifications:
OnFocus() OnBlur() View gains a Focus()/Blur() processing method pair. Cleans up code in FocusManager::SetFocusedView. Also adds OVERRIDE to a bunch of methods. BUG=72040 TEST=existing unittests. Review URL: http://codereview.chromium.org/6577010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/native')
-rw-r--r--views/controls/native/native_view_host.cc2
-rw-r--r--views/controls/native/native_view_host.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/views/controls/native/native_view_host.cc b/views/controls/native/native_view_host.cc
index 4566b80..9b6dff2 100644
--- a/views/controls/native/native_view_host.cc
+++ b/views/controls/native/native_view_host.cc
@@ -178,7 +178,7 @@ std::string NativeViewHost::GetClassName() const {
return kViewClassName;
}
-void NativeViewHost::Focus() {
+void NativeViewHost::OnFocus() {
native_wrapper_->SetFocus();
}
diff --git a/views/controls/native/native_view_host.h b/views/controls/native/native_view_host.h
index 9c06f35..e19aca2 100644
--- a/views/controls/native/native_view_host.h
+++ b/views/controls/native/native_view_host.h
@@ -80,7 +80,7 @@ class NativeViewHost : public View {
virtual void Layout();
virtual void OnPaint(gfx::Canvas* canvas);
virtual void VisibilityChanged(View* starting_from, bool is_visible);
- virtual void Focus();
+ virtual void OnFocus();
virtual bool ContainsNativeView(gfx::NativeView native_view) const;
protected: