TabContentsWrapper -> TabContents, part 1.

chrome/browser/ui/tab_contents/tab_contents.cc

 // 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.
 
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "chrome/browser/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/automation/automation_tab_helper.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
@@ skipping 36 matching lines @@
 #include "content/public/browser/web_contents.h"
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #endif
 
 using content::WebContents;
 
 namespace {
 
-static base::LazyInstance<base::PropertyAccessor<TabContentsWrapper*> >
+static base::LazyInstance<base::PropertyAccessor<TabContents*> >
     g_tab_contents_wrapper_property_accessor = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
-// TabContentsWrapper, public:
+// TabContents, public:
 
-TabContentsWrapper::TabContentsWrapper(WebContents* contents)
+TabContents::TabContents(WebContents* contents)
     : content::WebContentsObserver(contents),
       in_destructor_(false),
       web_contents_(contents) {
   DCHECK(contents);
   DCHECK(!GetCurrentWrapperForContents(contents));
 
   chrome::SetViewType(contents, chrome::VIEW_TYPE_TAB_CONTENTS);
 
   // Stash this in the property bag so it can be retrieved without having to
   // go to a Browser.
@@ skipping 77 matching lines @@
   // We don't want to check that the profile is already connected at this time
   // because the connected state may change while this tab is open.  Having a
   // one-click signin helper attached does not cause problems if the profile
   // happens to be already connected.
 #if defined(ENABLE_ONE_CLICK_SIGNIN)
   if (OneClickSigninHelper::CanOffer(contents, false))
       one_click_signin_helper_.reset(new OneClickSigninHelper(contents));
 #endif
 }
 
-TabContentsWrapper::~TabContentsWrapper() {
+TabContents::~TabContents() {
   in_destructor_ = true;
 
   // Need to reset |thumbnail_generator_| here before |web_contents_| is
   // deleted because destructing |web_contents_| can end up causing the
-  // thumbnailer to generate a thumbnail. Since TabContentsWrapper can be
+  // thumbnailer to generate a thumbnail. Since TabContents can be
   // destructed during shutdown, trying to generate a thumbnail by sending an
   // IPC message to the GPU process is not safe. Sending
   // chrome::NOTIFICATION_TAB_CONTENTS_DESTROYED can also cause the thumbnailer
   // to generate a thumbnail, so this must be placed before sending the
   // notification.
   thumbnail_generator_.reset();
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TAB_CONTENTS_DESTROYED,
-      content::Source<TabContentsWrapper>(this),
+      content::Source<TabContents>(this),
       content::NotificationService::NoDetails());
 
   // Need to tear down infobars before the WebContents goes away.
   // TODO(avi): Can we get this handled by the tab helper itself?
   infobar_tab_helper_.reset();
 }
 
-base::PropertyAccessor<TabContentsWrapper*>*
-    TabContentsWrapper::property_accessor() {
+base::PropertyAccessor<TabContents*>* TabContents::property_accessor() {
   return g_tab_contents_wrapper_property_accessor.Pointer();
 }
 
-TabContentsWrapper* TabContentsWrapper::Clone() {
+TabContents* TabContents::Clone() {
   WebContents* new_contents = web_contents()->Clone();
-  TabContentsWrapper* new_wrapper = new TabContentsWrapper(new_contents);
+  TabContents* new_wrapper = new TabContents(new_contents);
 
   // TODO(avi): Can we generalize this so that knowledge of the functionings of
   // the tab helpers isn't required here?
   new_wrapper->extension_tab_helper()->CopyStateFrom(
       *extension_tab_helper_.get());
   return new_wrapper;
 }
 
 // static
-TabContentsWrapper* TabContentsWrapper::GetCurrentWrapperForContents(
+TabContents* TabContents::GetCurrentWrapperForContents(
     WebContents* contents) {
-  TabContentsWrapper** wrapper =
+  TabContents** wrapper =
       property_accessor()->GetProperty(contents->GetPropertyBag());
 
   return wrapper ? *wrapper : NULL;
 }
 
 // static
-const TabContentsWrapper* TabContentsWrapper::GetCurrentWrapperForContents(
+const TabContents* TabContents::GetCurrentWrapperForContents(
     const WebContents* contents) {
-  TabContentsWrapper* const* wrapper =
+  TabContents* const* wrapper =
       property_accessor()->GetProperty(contents->GetPropertyBag());
 
   return wrapper ? *wrapper : NULL;
 }
 
-WebContents* TabContentsWrapper::web_contents() const {
+WebContents* TabContents::web_contents() const {
   return web_contents_.get();
 }
 
-Profile* TabContentsWrapper::profile() const {
+Profile* TabContents::profile() const {
   return Profile::FromBrowserContext(web_contents()->GetBrowserContext());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsObserver overrides
 
-void TabContentsWrapper::WebContentsDestroyed(WebContents* tab) {
+void TabContents::WebContentsDestroyed(WebContents* tab) {
   // Destruction of the WebContents should only be done by us from our
   // destructor. Otherwise it's very likely we (or one of the helpers we own)
   // will attempt to access the WebContents and we'll crash.
   DCHECK(in_destructor_);
 }