Remove usages of RootView from View by moving relevant RootView API methods t...

chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc

 // Copyright (c) 2011 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/ui/views/tab_contents/native_tab_contents_container_gtk.h"
 
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/tab_contents/interstitial_page.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
 #include "views/focus/focus_manager.h"
-#include "views/widget/root_view.h"
-#include "views/widget/widget.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabContentsContainerGtk, public:
 
 NativeTabContentsContainerGtk::NativeTabContentsContainerGtk(
     TabContentsContainer* container)
     : container_(container),
       focus_callback_id_(0) {
   SetID(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW);
 }
@@ skipping 80 matching lines @@
 
 void NativeTabContentsContainerGtk::RequestFocus() {
   // This is a hack to circumvent the fact that a view does not explicitly get
   // a call to set the focus if it already has the focus. This causes a problem
   // with tabs such as the TabContents that instruct the RenderView that it got
   // focus when they actually get the focus. When switching from one TabContents
   // tab that has focus to another TabContents tab that had focus, since the
   // TabContentsContainerView already has focus, Focus() would not be called and
   // the RenderView would not get notified it got focused.
   // By clearing the focused view before-hand, we ensure Focus() will be called.
-  GetRootView()->FocusView(NULL);
+  views::FocusManager* focus_manager = GetFocusManager();
+  if (focus_manager)
+    focus_manager->SetFocusedView(NULL);
   View::RequestFocus();
 }
 
 void NativeTabContentsContainerGtk::AboutToRequestFocusFromTabTraversal(
     bool reverse) {
   if (!container_->tab_contents())
     return;
   // Give an opportunity to the tab to reset its focus.
   if (container_->tab_contents()->interstitial_page()) {
     container_->tab_contents()->interstitial_page()->FocusThroughTabTraversal(
         reverse);
     return;
   }
   container_->tab_contents()->FocusThroughTabTraversal(reverse);
 }
 
 AccessibilityTypes::Role NativeTabContentsContainerGtk::GetAccessibleRole() {
   return AccessibilityTypes::ROLE_GROUPING;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabContentsContainer, public:
 
 // static
 NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer(
     TabContentsContainer* container) {
   return new NativeTabContentsContainerGtk(container);
 }