views: Factor WidgetFocusManager out of FocusManager class.

This moves WidgetFocusManager into its source/header files avoiding the use of nested classes.

R=sky@chromium.org

Review URL: http://codereview.chromium.org/7885001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101002 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 40 deletions

diff --git a/views/focus/focus_manager.cc b/views/focus/focus_manager.cc
index d58e4a11..d09d615 100644
--- a/views/focus/focus_manager.cc
+++ b/views/focus/focus_manager.cc
@@ -13,47 +13,13 @@
 #include "views/accelerator.h"
 #include "views/focus/focus_search.h"
 #include "views/focus/view_storage.h"
+#include "views/focus/widget_focus_manager.h"
 #include "views/view.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
 namespace views {
 
-// FocusManager::WidgetFocusManager ---------------------------------
-
-void FocusManager::WidgetFocusManager::AddFocusChangeListener(
-    WidgetFocusChangeListener* listener) {
-  focus_change_listeners_.AddObserver(listener);
-}
-
-void FocusManager::WidgetFocusManager::RemoveFocusChangeListener(
-    WidgetFocusChangeListener* listener) {
-  focus_change_listeners_.RemoveObserver(listener);
-}
-
-void FocusManager::WidgetFocusManager::OnWidgetFocusEvent(
-    gfx::NativeView focused_before,
-    gfx::NativeView focused_now) {
-  if (enabled_) {
-    FOR_EACH_OBSERVER(WidgetFocusChangeListener, focus_change_listeners_,
-                      NativeFocusWillChange(focused_before, focused_now));
-  }
-}
-
-FocusManager::WidgetFocusManager::WidgetFocusManager() : enabled_(true) {
-}
-
-FocusManager::WidgetFocusManager::~WidgetFocusManager() {
-}
-
-// static
-FocusManager::WidgetFocusManager*
-FocusManager::WidgetFocusManager::GetInstance() {
-  return Singleton<WidgetFocusManager>::get();
-}
-
-// FocusManager -----------------------------------------------------
-
 FocusManager::FocusManager(Widget* widget)
     : widget_(widget),
       focused_view_(NULL),
@@ -67,11 +33,6 @@ FocusManager::FocusManager(Widget* widget)
 FocusManager::~FocusManager() {
 }
 
-// static
-FocusManager::WidgetFocusManager* FocusManager::GetWidgetFocusManager() {
-  return WidgetFocusManager::GetInstance();
-}
-
 bool FocusManager::OnKeyEvent(const KeyEvent& event) {
 #if defined(OS_WIN)
   // If the focused view wants to process the key event as is, let it be.