TabContentsWrapper -> TabContents, part 6.

chrome/browser/external_tab/external_tab_container_win.h

 // Copyright (c) 2012 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_EXTERNAL_TAB_CONTAINER_WIN_H_
 #define CHROME_BROWSER_EXTERNAL_TAB_EXTERNAL_TAB_CONTAINER_WIN_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 14 matching lines @@
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/views/widget/native_widget_win.h"
 
 class AutomationProvider;
 class Browser;
 class Profile;
 class TabContentsContainer;
 class TabContents;
-typedef TabContents TabContentsWrapper;
 class RenderViewContextMenuViews;
 struct NavigationInfo;
 
 namespace content {
 class WebIntentsDispatcher;
 }
 
 namespace ui {
 class ViewProp;
 }
@@ skipping 14 matching lines @@
                              public ui::AcceleratorTarget,
                              public InfoBarContainer::Delegate,
                              public BlockedContentTabHelperDelegate {
  public:
   typedef std::map<uintptr_t, scoped_refptr<ExternalTabContainer> > PendingTabs;
 
   ExternalTabContainer(AutomationProvider* automation,
                        AutomationResourceMessageFilter* filter);
 
   content::WebContents* web_contents() const;
-  TabContentsWrapper* tab_contents_wrapper() { return tab_contents_.get(); }
+  TabContents* tab_contents() { return tab_contents_.get(); }
 
   // Temporary hack so we can send notifications back
   void SetTabHandle(int handle);
 
   int tab_handle() const {
     return tab_handle_;
   }
 
   bool Init(Profile* profile,
             HWND parent,
             const gfx::Rect& bounds,
             DWORD style,
             bool load_requests_via_automation,
             bool handle_top_level_requests,
-            TabContentsWrapper* existing_tab_contents,
+            TabContents* existing_tab_contents,
             const GURL& initial_url,
             const GURL& referrer,
             bool infobars_enabled,
             bool supports_full_tab_mode);
 
   // Unhook the keystroke listener and notify about the closing WebContents.
   // This function gets called from three places, which is fine.
   // 1. OnFinalMessage
   // 2. In the destructor.
   // 3. In AutomationProvider::CreateExternalTab
@@ skipping 142 matching lines @@
   }
 
   // InfoBarContainer::Delegate overrides
   virtual SkColor GetInfoBarSeparatorColor() const OVERRIDE;
   virtual void InfoBarContainerStateChanged(bool is_animating) OVERRIDE;
   virtual bool DrawInfoBarArrows(int* x) const OVERRIDE;
 
   void RunUnloadHandlers(IPC::Message* reply_message);
 
   // Overridden from BlockedContentTabHelperDelegate:
-  virtual TabContentsWrapper* GetConstrainingContentsWrapper(
-      TabContentsWrapper* source) OVERRIDE;
+  virtual TabContents* GetConstrainingContentsWrapper(
+      TabContents* source) OVERRIDE;
 
  protected:
   ~ExternalTabContainer();
   // Overridden from views::NativeWidgetWin:
   virtual LRESULT OnCreate(LPCREATESTRUCT create_struct);
   virtual void OnDestroy();
   virtual void OnFinalMessage(HWND window);
 
   bool InitNavigationInfo(NavigationInfo* nav_info,
                           content::NavigationType nav_type,
@@ skipping 17 matching lines @@
 
   // Sends over pending Open URL requests to the external host.
   void ServicePendingOpenURLRequests();
 
   // Scheduled as a task in ExternalTabContainer::Reinitialize
   void OnReinitialize();
 
   // Creates and initializes the view hierarchy for this ExternalTabContainer.
   void SetupExternalTabView();
 
-  scoped_ptr<TabContentsWrapper> tab_contents_;
+  scoped_ptr<TabContents> tab_contents_;
   scoped_refptr<AutomationProvider> automation_;
 
   content::NotificationRegistrar registrar_;
 
   // A view to handle focus cycling
   views::WebView* tab_contents_container_;
 
   int tab_handle_;
   // 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
@@ skipping 122 matching lines @@
     return false;
   }
 
   virtual void BeforeUnloadFired(content::WebContents* tab, bool proceed,
                                  bool* proceed_to_fire_unload) {
     NOTREACHED();
   }
 };
 
 #endif  // CHROME_BROWSER_EXTERNAL_TAB_EXTERNAL_TAB_CONTAINER_WIN_H_