Reverting 18872.

views/controls/tree/tree_view.cc

 // Copyright (c) 2006-2008 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/tree/tree_view.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlmisc.h>
 
@@ skipping 453 matching lines @@
   if (virtual_key_code == VK_F2) {
     if (!GetEditingNode()) {
       TreeModelNode* selected_node = GetSelectedNode();
       if (selected_node)
         StartEditing(selected_node);
     }
     return true;
   } else if (virtual_key_code == VK_RETURN && !process_enter_) {
     Widget* widget = GetWidget();
     DCHECK(widget);
+    FocusManager* fm = FocusManager::GetFocusManager(widget->GetNativeView());
+    DCHECK(fm);
     Accelerator accelerator(Accelerator(static_cast<int>(virtual_key_code),
                                         win_util::IsShiftPressed(),
                                         win_util::IsCtrlPressed(),
                                         win_util::IsAltPressed()));
-    GetFocusManager()->ProcessAccelerator(accelerator);
+    fm->ProcessAccelerator(accelerator);
     return true;
   }
   return false;
 }
 
 void TreeView::OnContextMenu(const WTL::CPoint& location) {
   if (!GetContextMenuController())
     return;
 
   if (location.x == -1 && location.y == -1) {
@@ skipping 247 matching lines @@
       }
       // Fall through and let the default handler process as well.
       break;
   }
   WNDPROC handler = tree->original_handler_;
   DCHECK(handler);
   return CallWindowProc(handler, window, message, w_param, l_param);
 }
 
 }  // namespace views