Relanding focus manager refactoring

chrome/browser/automation/automation_provider.cc

 // Copyright (c) 2006-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 "chrome/browser/automation/automation_provider.h"
 
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
 #include "base/file_version_info.h"
 #include "base/json_reader.h"
@@ skipping 1711 matching lines @@
                               views::Event::EF_SHIFT_DOWN),
                             ((flags & views::Event::EF_ALT_DOWN) ==
                               views::Event::EF_ALT_DOWN));
 }
 
 void AutomationProvider::GetFocusedViewID(int handle, int* view_id) {
   *view_id = -1;
   if (window_tracker_->ContainsHandle(handle)) {
     HWND hwnd = window_tracker_->GetResource(handle);
     views::FocusManager* focus_manager =
-        views::FocusManager::GetFocusManager(hwnd);
+        views::FocusManager::GetFocusManagerForNativeView(hwnd);
     DCHECK(focus_manager);
     views::View* focused_view = focus_manager->GetFocusedView();
     if (focused_view)
       *view_id = focused_view->GetID();
   }
 }
 
 void AutomationProvider::SetWindowVisible(int handle, bool visible,
                                           bool* result) {
   if (window_tracker_->ContainsHandle(handle)) {
@@ skipping 1299 matching lines @@
         if (container) {
           *count = static_cast<int>(container->GetBlockedPopupCount());
         } else {
           // If we don't have a container, we don't have any blocked popups to
           // contain!
           *count = 0;
         }
       }
   }
 }