Relanding focus manager refactoring

views/controls/native_control_win.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
 #include "views/controls/native_control_win.h"
 
 #include "app/l10n_util_win.h"
 #include "base/logging.h"
 #include "base/win_util.h"
 #include "views/focus/focus_manager.h"
@@ skipping 178 matching lines @@
                                                LPARAM l_param) {
   NativeControlWin* native_control =
       static_cast<NativeControlWin*>(GetProp(window, kNativeControlWinKey));
   DCHECK(native_control);
 
   if (message == WM_KEYDOWN && native_control->NotifyOnKeyDown()) {
     if (native_control->OnKeyDown(static_cast<int>(w_param)))
       return 0;
   } else if (message == WM_SETFOCUS) {
     // Let the focus manager know that the focus changed.
-    FocusManager* focus_manager =
-        FocusManager::GetFocusManager(native_control->native_view());
+    FocusManager* focus_manager = native_control->GetFocusManager();
     if (focus_manager) {
       focus_manager->SetFocusedView(native_control->focus_view());
     } else {
       NOTREACHED();
     }
   } else if (message == WM_DESTROY) {
     win_util::SetWindowProc(window, native_control->original_wndproc_);
   }
 
   return CallWindowProc(native_control->original_wndproc_, window, message,
                         w_param, l_param);
 }
 
 }  // namespace views