TabContentsWrapper -> TabContents, part 53.

chrome/browser/ui/browser_navigator.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_
 #define CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_
 #pragma once
 
 #include <string>
 
 #include "content/public/browser/global_request_id.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/common/referrer.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/rect.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class Browser;
 class Profile;
 class TabContents;
-typedef TabContents TabContentsWrapper;
 
 namespace browser {
 
 // Parameters that tell Navigate() what to do.
 //
 // Some basic examples:
 //
 // Simple Navigate to URL in current tab:
 // browser::NavigateParams params(browser, GURL("http://www.google.com/"),
 //                                PageTransition::LINK);
 // browser::Navigate(&params);
 //
 // Open bookmark in new background tab:
 // browser::NavigateParams params(browser, url, PageTransition::AUTO_BOOKMARK);
 // params.disposition = NEW_BACKGROUND_TAB;
 // browser::Navigate(&params);
 //
-// Opens a popup TabContentsWrapper:
+// Opens a popup TabContents:
 // browser::NavigateParams params(browser, popup_contents);
 // params.source_contents = source_contents;
 // browser::Navigate(&params);
 //
 // See browser_navigator_browsertest.cc for more examples.
 //
 struct NavigateParams {
   NavigateParams(Browser* browser,
                  const GURL& a_url,
                  content::PageTransition a_transition);
-  NavigateParams(Browser* browser, TabContentsWrapper* a_target_contents);
+  NavigateParams(Browser* browser, TabContents* a_target_contents);
   ~NavigateParams();
 
   // The URL/referrer to be loaded. Ignored if |target_contents| is non-NULL.
   GURL url;
   content::Referrer referrer;
 
-  // [in]  A TabContentsWrapper to be navigated or inserted into the target
+  // [in]  A TabContents to be navigated or inserted into the target
   //       Browser's tabstrip. If NULL, |url| or the homepage will be used
   //       instead. When non-NULL, Navigate() assumes it has already been
   //       navigated to its intended destination and will not load any URL in it
   //       (i.e. |url| is ignored).
   //       Default is NULL.
-  // [out] The TabContentsWrapper in which the navigation occurred or that was
+  // [out] The TabContents in which the navigation occurred or that was
   //       inserted. Guaranteed non-NULL except for note below:
   // Note: If this field is set to NULL by the caller and Navigate() creates
-  //       a new TabContentsWrapper, this field will remain NULL and the
-  //       TabContentsWrapper deleted if the TabContentsWrapper it created is
+  //       a new TabContents, this field will remain NULL and the
+  //       TabContents deleted if the TabContents it created is
   //       not added to a TabStripModel before Navigate() returns.
-  TabContentsWrapper* target_contents;
+  TabContents* target_contents;
 
-  // [in]  The TabContentsWrapper that initiated the Navigate() request if such
+  // [in]  The TabContents that initiated the Navigate() request if such
   //       context is necessary. Default is NULL, i.e. no context.
-  // [out] If NULL, this value will be set to the selected TabContentsWrapper in
+  // [out] If NULL, this value will be set to the selected TabContents in
   //       the originating browser prior to the operation performed by
   //       Navigate(). However, if the originating page is from a different
   //       profile (e.g. an OFF_THE_RECORD page originating from a non-OTR
   //       window), then |source_contents| is reset to NULL.
-  TabContentsWrapper* source_contents;
+  TabContents* source_contents;
 
   // The disposition requested by the navigation source. Default is
   // CURRENT_TAB. What follows is a set of coercions that happen to this value
   // when other factors are at play:
   //
   // [in]:                Condition:                        [out]:
   // NEW_BACKGROUND_TAB   target browser tabstrip is empty  NEW_FOREGROUND_TAB
   // CURRENT_TAB          "     "     "                     NEW_FOREGROUND_TAB
   // OFF_THE_RECORD       target browser profile is incog.  NEW_FOREGROUND_TAB
   //
@@ skipping 109 matching lines @@
 // If the given navigational URL is a Singleton, return the tab index for it.
 // Otherwise, returns -1.
 int GetIndexOfSingletonTab(NavigateParams* params);
 
 // Returns true if the url is allowed to open in incognito window.
 bool IsURLAllowedInIncognito(const GURL& url);
 
 }  // namespace browser
 
 #endif  // CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_