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

4 files changed, 6 insertions, 6 deletions

diff --git a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
index a82e893..0b47abde 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
@@ -104,7 +104,7 @@ View* NativeTabbedPaneGtk::GetView() {
 }
 
 void NativeTabbedPaneGtk::SetFocus() {
-  Focus();
+  OnFocus();
 }
 
 gfx::Size NativeTabbedPaneGtk::GetPreferredSize() {
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
index aa651ac..ba4ffe6 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_win.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
@@ -235,7 +235,7 @@ View* NativeTabbedPaneWin::GetView() {
 
 void NativeTabbedPaneWin::SetFocus() {
   // Focus the associated HWND.
-  Focus();
+  OnFocus();
 }
 
 gfx::Size NativeTabbedPaneWin::GetPreferredSize() {
diff --git a/views/controls/tabbed_pane/tabbed_pane.cc b/views/controls/tabbed_pane/tabbed_pane.cc
index 41f4432..eb9f971 100644
--- a/views/controls/tabbed_pane/tabbed_pane.cc
+++ b/views/controls/tabbed_pane/tabbed_pane.cc
@@ -112,7 +112,7 @@ void TabbedPane::Layout() {
     native_tabbed_pane_->GetView()->SetBounds(0, 0, width(), height());
 }
 
-void TabbedPane::Focus() {
+void TabbedPane::OnFocus() {
   // Forward the focus to the wrapper.
   if (native_tabbed_pane_) {
     native_tabbed_pane_->SetFocus();
@@ -122,8 +122,8 @@ void TabbedPane::Focus() {
        selected_tab->NotifyAccessibilityEvent(AccessibilityTypes::EVENT_FOCUS);
   }
   else
-    View::Focus();  // Will focus the RootView window (so we still get keyboard
-                    // messages).
+    View::OnFocus();  // Will focus the RootView window (so we still get
+                      // keyboard messages).
 }
 
 void TabbedPane::OnPaintFocusBorder(gfx::Canvas* canvas) {
diff --git a/views/controls/tabbed_pane/tabbed_pane.h b/views/controls/tabbed_pane/tabbed_pane.h
index 7c991c3..4fdb727 100644
--- a/views/controls/tabbed_pane/tabbed_pane.h
+++ b/views/controls/tabbed_pane/tabbed_pane.h
@@ -69,7 +69,7 @@ class TabbedPane : public View {
   virtual bool AcceleratorPressed(const views::Accelerator& accelerator);
   virtual std::string GetClassName() const;
   virtual void Layout();
-  virtual void Focus();
+  virtual void OnFocus();
   virtual void OnPaintFocusBorder(gfx::Canvas* canvas);
   virtual AccessibilityTypes::Role GetAccessibleRole();
   virtual gfx::Size GetPreferredSize();