Make the RenderViewHostFactory a global. This prevents us from having to pass...

chrome/browser/external_tab_container.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 "chrome/browser/external_tab_container.h"
 
 #include "base/logging.h"
 #include "base/win_util.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/profile.h"
@@ skipping 46 matching lines @@
   SetProp(*this, kWindowObjectKey, this);
 
   views::SetRootViewForHWND(m_hWnd, &root_view_);
   // CreateFocusManager will subclass this window and delete the FocusManager
   // instance when this window goes away.
   views::FocusManager* focus_manager =
       views::FocusManager::CreateFocusManager(m_hWnd, GetRootView());
 
   DCHECK(focus_manager);
   focus_manager->AddKeystrokeListener(this);
-  tab_contents_ = TabContents::CreateWithType(TAB_CONTENTS_WEB, profile,
-                                              NULL, NULL);
-  if (!tab_contents_) {
-    NOTREACHED();
-    DestroyWindow();
-    return false;
-  }
 
+  tab_contents_ = new WebContents(profile, NULL, MSG_ROUTING_NONE, NULL);
   tab_contents_->SetupController(profile);
   tab_contents_->set_delegate(this);
-
-  WebContents* web_conents = tab_contents_->AsWebContents();
-  if (web_conents)
-    web_conents->render_view_host()->AllowExternalHostBindings();
+  tab_contents_->render_view_host()->AllowExternalHostBindings();
 
   // Create a TabContentsContainerView to handle focus cycling using Tab and
   // Shift-Tab.
   tab_contents_container_ = new TabContentsContainerView();
   root_view_.AddChildView(tab_contents_container_);
   // Note that SetTabContents must be called after AddChildView is called
   tab_contents_container_->SetTabContents(tab_contents_);
   // Add a dummy view to catch when the user tabs out of the tab
   // Create a dummy FocusTraversable object to represent the frame of the
   // external host. This will allow Tab and Shift-Tab to cycle into the
@@ skipping 304 matching lines @@
   // back. Since the external host was not interested in handling this, we
   // need to dispatch this message as if we had just peeked this out. (we
   // also need to call TranslateMessage to generate a WM_CHAR if needed).
   TranslateMessage(&msg);
   DispatchMessage(&msg);
 }
 
 void ExternalTabContainer::SetInitialFocus(bool reverse) {
   DCHECK(tab_contents_);
   if (tab_contents_) {
-    tab_contents_->SetInitialFocus(reverse);
+    static_cast<TabContents*>(tab_contents_)->SetInitialFocus(reverse);
   }
 }
 
 // static
 bool ExternalTabContainer::IsExternalTabContainer(HWND window) {
   std::wstring class_name = win_util::GetClassName(window);
   return _wcsicmp(class_name.c_str(), chrome::kExternalTabWindowClass) == 0;
 }
 
 // static
 ExternalTabContainer* ExternalTabContainer::GetContainerForTab(
     HWND tab_window) {
   HWND parent_window = ::GetParent(tab_window);
   if (!::IsWindow(parent_window)) {
     return NULL;
   }
   if (!IsExternalTabContainer(parent_window)) {
     return NULL;
   }
   ExternalTabContainer* container = reinterpret_cast<ExternalTabContainer*>(
       GetProp(parent_window, kWindowObjectKey));
   return container;
 }