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

chrome/browser/external_tab_container.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_H_
 #define CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_H_
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlmisc.h>
 #include <string>
 
 #include "base/basictypes.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/views/focus/focus_manager.h"
 #include "chrome/views/widget/root_view.h"
 #include "chrome/views/widget/widget.h"
 
 class AutomationProvider;
-class TabContents;
+class WebContents;
 class Profile;
 class TabContentsContainerView;
 // This class serves as the container window for an external tab.
 // An external tab is a Chrome tab that is meant to displayed in an
 // external process. This class provides the FocusManger needed by the
 // TabContents as well as an implementation of TabContentsDelagate.
 // It also implements Container
 class ExternalTabContainer : public TabContentsDelegate,
                              public NotificationObserver,
                              public views::Widget,
                              public views::KeystrokeListener,
                              public CWindowImpl<ExternalTabContainer,
                                                 CWindow,
                                                 CWinTraits<WS_POPUP |
                                                     WS_CLIPCHILDREN>> {
  public:
   BEGIN_MSG_MAP(ExternalTabContainer)
     MESSAGE_HANDLER(WM_SIZE, OnSize)
     MESSAGE_HANDLER(WM_SETFOCUS, OnSetFocus)
   END_MSG_MAP()
 
   DECLARE_WND_CLASS(chrome::kExternalTabWindowClass)
 
   ExternalTabContainer(AutomationProvider* automation);
   ~ExternalTabContainer();
 
-  TabContents* tab_contents() const {
+  WebContents* tab_contents() const {
     return tab_contents_;
   }
 
   bool Init(Profile* profile, HWND parent, const gfx::Rect& dimensions,
             unsigned int style);
 
   // This function gets called from two places, which is fine.
   // 1. OnFinalMessage
   // 2. In the destructor.
   bool Uninitialize(HWND window);
@@ skipping 72 matching lines @@
   // hosts the given tab window.
   static ExternalTabContainer* GetContainerForTab(HWND tab_window);
 
  protected:
   LRESULT OnSize(UINT, WPARAM, LPARAM, BOOL& handled);
   LRESULT OnSetFocus(UINT msg, WPARAM wp, LPARAM lp, BOOL& handled);
   void OnDestroy();
   void OnFinalMessage(HWND window);
 
  protected:
-  TabContents *tab_contents_;
+  WebContents* tab_contents_;
   scoped_refptr<AutomationProvider> automation_;
 
   NotificationRegistrar registrar_;
 
   // Root view
   views::RootView root_view_;
   // The accelerator table of the external host.
   HACCEL external_accel_table_;
   unsigned int external_accel_entry_count_;
   // A view to handle focus cycling
   TabContentsContainerView* tab_contents_container_;
+
  private:
   // A failed navigation like a 404 is followed in chrome with a success
   // navigation for the 404 page. We need to ignore the next navigation
   // to avoid confusing the clients of the external tab. This member variable
   // is set when we need to ignore the next load notification.
   bool ignore_next_load_notification_;
 
   DISALLOW_COPY_AND_ASSIGN(ExternalTabContainer);
 };
 
-#endif  // CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_H__
+#endif  // CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_H_