TabContentsWrapper -> TabContents, part 1.

chrome/browser/ui/tab_contents/tab_contents.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_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
-#define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
+#ifndef CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_
+#define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/property_bag.h"
 #include "content/public/browser/web_contents_observer.h"
 
 class AlternateErrorPageTabObserver;
@@ skipping 50 matching lines @@
 class PrintPreviewMessageHandler;
 }
 
 namespace safe_browsing {
 class SafeBrowsingTabObserver;
 }
 
 // Wraps WebContents and all of its supporting objects in order to control
 // their ownership and lifetime.
 //
-// WARNING: Not every place where HTML can run has a TabContentsWrapper. This
-// class is *only* used in a visible, actual, tab inside a browser. Examples of
-// things that do not have tab wrappers include:
+// WARNING: Not every place where HTML can run has a TabContents. This class is
+// *only* used in a visible, actual, tab inside a browser. Examples of things
+// that do not have a TabContents include:
 // - Extension background pages and popup bubbles
 // - HTML notification bubbles
 // - Screensavers on Chrome OS
 // - Other random places we decide to display HTML over time
 //
 // Consider carefully whether your feature is something that makes sense only
 // when a tab is displayed, or could make sense in other cases we use HTML. It
 // may makes sense to push down into WebContents and make configurable, or at
 // least to make easy for other WebContents hosts to include and support.
 //
 // TODO(avi): Eventually, this class will become TabContents as far as
 // the browser front-end is concerned.
-class TabContentsWrapper : public content::WebContentsObserver {
+class TabContents : public content::WebContentsObserver {
  public:
   // Takes ownership of |contents|, which must be heap-allocated (as it lives
   // in a scoped_ptr) and can not be NULL.
-  explicit TabContentsWrapper(content::WebContents* contents);
-  virtual ~TabContentsWrapper();
+  explicit TabContents(content::WebContents* contents);
+  virtual ~TabContents();
 
-  // Create a TabContentsWrapper with the same state as this one. The returned
+  // Create a TabContents with the same state as this one. The returned
   // heap-allocated pointer is owned by the caller.
-  TabContentsWrapper* Clone();
+  TabContents* Clone();
 
-  // Helper to retrieve the existing instance that wraps a given WebContents.
+  // Helper to retrieve the existing instance that owns a given WebContents.
   // Returns NULL if there is no such existing instance.
   // NOTE: This is not intended for general use. It is intended for situations
   // like callbacks from content/ where only a WebContents is available. In the
-  // general case, please do NOT use this; plumb TabContentsWrapper through the
-  // chrome/ code instead of WebContents.
-  static TabContentsWrapper* GetCurrentWrapperForContents(
+  // general case, please do NOT use this; plumb TabContents through the chrome/
+  // code instead of WebContents.
+  static TabContents* GetCurrentWrapperForContents(
       content::WebContents* contents);
-  static const TabContentsWrapper* GetCurrentWrapperForContents(
+  static const TabContents* GetCurrentWrapperForContents(
       const content::WebContents* contents);
 
-  // Returns the WebContents that this wraps.
+  // Returns the WebContents that this owns.
   content::WebContents* web_contents() const;
 
-  // Returns the Profile that is associated with this TabContentsWrapper.
+  // Returns the Profile that is associated with this TabContents.
   Profile* profile() const;
 
-  // True if this TabContentsWrapper is being torn down.
+  // True if this TabContents is being torn down.
   bool in_destructor() const { return in_destructor_; }
 
   // Tab Helpers ---------------------------------------------------------------
 
   AutocompleteHistoryManager* autocomplete_history_manager() {
     return autocomplete_history_manager_.get();
   }
 
   AutofillManager* autofill_manager() { return autofill_manager_.get(); }
 
@@ skipping 91 matching lines @@
   }
 
   // Overrides -----------------------------------------------------------------
 
   // content::WebContentsObserver overrides:
   virtual void WebContentsDestroyed(content::WebContents* tab) OVERRIDE;
 
  private:
   // Used to retrieve this object from |web_contents_|, which is placed in
   // its property bag to avoid adding additional interfaces.
-  static base::PropertyAccessor<TabContentsWrapper*>* property_accessor();
+  static base::PropertyAccessor<TabContents*>* property_accessor();
 
   // Tab Helpers ---------------------------------------------------------------
   // (These provide API for callers and have a getter function listed in the
   // "Tab Helpers" section in the member functions area, above.)
 
   scoped_ptr<AutocompleteHistoryManager> autocomplete_history_manager_;
   scoped_refptr<AutofillManager> autofill_manager_;
   scoped_ptr<AutofillExternalDelegate> autofill_external_delegate_;
   scoped_ptr<AutomationTabHelper> automation_tab_helper_;
   scoped_ptr<BlockedContentTabHelper> blocked_content_tab_helper_;
@@ skipping 55 matching lines @@
   // WebContents (MUST BE LAST) ------------------------------------------------
 
   // If true, we're running the destructor.
   bool in_destructor_;
 
   // The supporting objects need to outlive the WebContents dtor (as they may
   // be called upon during its execution). As a result, this must come last
   // in the list.
   scoped_ptr<content::WebContents> web_contents_;
 
-  DISALLOW_COPY_AND_ASSIGN(TabContentsWrapper);
+  DISALLOW_COPY_AND_ASSIGN(TabContents);
 };
 
-#endif  // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
+#endif  // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_