TabContentsWrapper -> TabContents, part 48.

chrome/browser/ui/views/hung_renderer_view.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/browser_dialogs.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include <windows.h>
 #endif
 
 #include "base/i18n/rtl.h"
 #include "base/memory/scoped_vector.h"
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/logging_chrome.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/result_codes.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 61 matching lines @@
   virtual gfx::ImageSkia GetIcon(int row);
   virtual void SetObserver(ui::TableModelObserver* observer);
   virtual void GetGroupRangeForItem(int item, views::GroupRange* range);
 
  private:
   // Used to track a single WebContents. If the WebContents is destroyed
   // TabDestroyed() is invoked on the model.
   class WebContentsObserverImpl : public content::WebContentsObserver {
    public:
     WebContentsObserverImpl(HungPagesTableModel* model,
-                            TabContentsWrapper* tab);
+                            TabContents* tab);
 
     WebContents* web_contents() const {
       return content::WebContentsObserver::web_contents();
     }
 
     FaviconTabHelper* favicon_tab_helper() {
       return tab_->favicon_tab_helper();
     }
 
     // WebContentsObserver overrides:
     virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE;
     virtual void WebContentsDestroyed(WebContents* tab) OVERRIDE;
 
    private:
     HungPagesTableModel* model_;
-    TabContentsWrapper* tab_;
+    TabContents* tab_;
 
     DISALLOW_COPY_AND_ASSIGN(WebContentsObserverImpl);
   };
 
   // Invoked when a WebContents is destroyed. Cleans up |tab_observers_| and
   // notifies the observer and delegate.
   void TabDestroyed(WebContentsObserverImpl* tab);
 
   typedef ScopedVector<WebContentsObserverImpl> TabObservers;
   TabObservers tab_observers_;
@@ skipping 22 matching lines @@
 
 RenderViewHost* HungPagesTableModel::GetRenderViewHost() {
   return tab_observers_.empty() ? NULL :
       tab_observers_[0]->web_contents()->GetRenderViewHost();
 }
 
 void HungPagesTableModel::InitForWebContents(WebContents* hung_contents) {
   tab_observers_.reset();
   if (hung_contents) {
     // Force hung_contents to be first.
-    TabContentsWrapper* hung_wrapper =
-        TabContentsWrapper::GetCurrentWrapperForContents(hung_contents);
-    if (hung_wrapper)
-      tab_observers_.push_back(new WebContentsObserverImpl(this, hung_wrapper));
+    TabContents* hung_tab_contents =
+        TabContents::FromWebContents(hung_contents);
+    if (hung_tab_contents) {
+      tab_observers_.push_back(new WebContentsObserverImpl(this,
+                                                           hung_tab_contents));
+    }
     for (TabContentsIterator it; !it.done(); ++it) {
-      if (*it != hung_wrapper &&
+      if (*it != hung_tab_contents &&
           it->web_contents()->GetRenderProcessHost() ==
           hung_contents->GetRenderProcessHost())
         tab_observers_.push_back(new WebContentsObserverImpl(this, *it));
     }
   }
   // The world is different.
   if (observer_)
     observer_->OnModelChanged();
 }
 
@@ skipping 42 matching lines @@
   if (observer_)
     observer_->OnItemsRemoved(index, 1);
 
   // Notify the delegate.
   delegate_->TabDestroyed();
   // WARNING: we've likely been deleted.
 }
 
 HungPagesTableModel::WebContentsObserverImpl::WebContentsObserverImpl(
     HungPagesTableModel* model,
-    TabContentsWrapper* tab)
+    TabContents* tab)
     : content::WebContentsObserver(tab->web_contents()),
       model_(model),
       tab_(tab) {
 }
 
 void HungPagesTableModel::WebContentsObserverImpl::RenderViewGone(
     base::TerminationStatus status) {
   model_->TabDestroyed(this);
 }
 
@@ skipping 348 matching lines @@
     g_instance->ShowForWebContents(contents);
   }
 }
 
 void HideHungRendererDialog(WebContents* contents) {
   if (!logging::DialogsAreSuppressed() && g_instance)
     g_instance->EndForWebContents(contents);
 }
 
 }  // namespace browser