TabContentsWrapper -> TabContents, part 18.

chrome/browser/instant/instant_controller.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_INSTANT_INSTANT_CONTROLLER_H_
 #define CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
 #pragma once
 
 #include <set>
 #include <string>
@@ skipping 12 matching lines @@
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 
 struct AutocompleteMatch;
 class InstantDelegate;
 class InstantLoader;
 class InstantTest;
 class PrefService;
 class Profile;
 class TabContents;
-typedef TabContents TabContentsWrapper;
 class TemplateURL;
 
 // InstantController maintains a WebContents that is intended to give a preview
 // of a URL. InstantController is owned by Browser.
 //
 // At any time the WebContents maintained by InstantController may be destroyed
 // by way of |DestroyPreviewContents|, which results in |HideInstant| being
 // invoked on the delegate. Similarly the preview may be committed at any time
 // by invoking |CommitCurrentPreview|, which results in |CommitInstant|
 // being invoked on the delegate. Also see |PrepareForCommit| below.
@@ skipping 73 matching lines @@
   // return value of false means that there is no valid preview to commit. This
   // is used by Browser, when the user presses <Enter>, to decide whether to
   // load the omnibox contents through Instant or otherwise. This is needed
   // because calls to |Update| don't necessarily result in a preview being
   // shown, such as in the HIDDEN and SILENT modes.
   bool PrepareForCommit();
 
   // Invoked when the user does some gesture that should trigger making the
   // current previewed page the permanent page.  Returns the TCW that contains
   // the committed preview.
-  TabContentsWrapper* CommitCurrentPreview(InstantCommitType type);
+  TabContents* CommitCurrentPreview(InstantCommitType type);
 
   // Accepts the currently showing instant preview, if any, and returns true.
   // Returns false if there is no instant preview showing.
   bool CommitIfCurrent();
 
   // Sets InstantController so that when the mouse is released the preview is
   // committed.
   void SetCommitOnMouseUp();
 
   bool commit_on_mouse_up() const { return commit_on_mouse_up_; }
@@ skipping 10 matching lines @@
   // default search engine, in anticipation of the user typing a query.
   void OnAutocompleteGotFocus();
 
   // Releases the preview WebContents passing ownership to the caller. This is
   // intended to be called when the preview WebContents is committed. This does
   // not notify the delegate. |tab_contents| is the underlying tab onto which
   // the preview will be committed. It can be NULL when the underlying tab is
   // irrelevant, for example when |type| is INSTANT_COMMIT_DESTROY.
   // WARNING: be sure and invoke CompleteRelease after adding the returned
   // WebContents to a tabstrip.
-  TabContentsWrapper* ReleasePreviewContents(InstantCommitType type,
-                                             TabContentsWrapper* tab_contents);
+  TabContents* ReleasePreviewContents(InstantCommitType type,
+                                      TabContents* tab_contents);
 
   // Does cleanup after the preview contents has been added to the tabstrip.
   // Invoke this if you explicitly invoke ReleasePreviewContents.
-  void CompleteRelease(TabContentsWrapper* tab);
+  void CompleteRelease(TabContents* tab);
 
-  // The preview TabContentsWrapper; may be null.
-  TabContentsWrapper* GetPreviewContents() const;
+  // The preview TabContents; may be null.
+  TabContents* GetPreviewContents() const;
 
-  // Returns true if the preview TabContentsWrapper is ready to be displayed. In
+  // Returns true if the preview TabContents is ready to be displayed. In
   // some situations this may return false yet GetPreviewContents() returns
   // non-NULL.
   bool is_displayable() const { return is_displayable_; }
 
   // Returns the transition type of the last AutocompleteMatch passed to Update.
   content::PageTransition last_transition_type() const {
     return last_transition_type_;
   }
 
   // InstantLoaderDelegate
@@ skipping 14 matching lines @@
  private:
   friend class InstantTest;
 
   typedef std::set<std::string> HostBlacklist;
 
   // Updates |is_displayable_| and if necessary notifies the delegate.
   void UpdateIsDisplayable();
 
   // Updates InstantLoaderManager and its current InstantLoader. This is invoked
   // internally from Update.
-  void UpdateLoader(TabContentsWrapper* tab_contents,
+  void UpdateLoader(TabContents* tab_contents,
                     const TemplateURL* template_url,
                     const GURL& url,
                     content::PageTransition transition_type,
                     const string16& user_text,
                     bool verbatim,
                     string16* suggested_text);
 
   // Returns true if |template_url| is a valid TemplateURL for use by instant.
   bool IsValidInstantTemplateURL(const TemplateURL* template_url);
 
@@ skipping 55 matching lines @@
   // The most recent user_text passed to |Update|.
   string16 last_user_text_;
 
   // See the enum description above.
   const Mode mode_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantController);
 };
 
 #endif  // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_