TabContentsWrapper -> TabContents, part 41.

chrome/browser/ui/gtk/tabs/dragged_view_gtk.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/gtk/tabs/dragged_view_gtk.h"
 
 #include <gdk/gdk.h>
 
 #include <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "base/i18n/rtl.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/tabs/drag_data.h"
 #include "chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/base/gtk/gtk_screen_util.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/gtk_util.h"
 
 using content::WebContents;
 
@@ skipping 31 matching lines @@
       attached_tab_size_(TabRendererGtk::GetMinimumSelectedSize()),
       contents_size_(contents_size),
       close_animation_(this) {
   std::vector<WebContents*> data_sources(drag_data_->GetDraggedTabsContents());
   for (size_t i = 0; i < data_sources.size(); i++) {
     renderers_.push_back(new TabRendererGtk(GtkThemeService::GetFrom(
         Profile::FromBrowserContext(data_sources[i]->GetBrowserContext()))));
   }
 
   for (size_t i = 0; i < drag_data_->size(); i++) {
-    TabContentsWrapper* wrapper =
-        TabContentsWrapper::GetCurrentWrapperForContents(
-            drag_data_->get(i)->contents_->web_contents());
+    TabContents* tab_contents = TabContents::FromWebContents(
+        drag_data_->get(i)->contents_->web_contents());
     renderers_[i]->UpdateData(
         drag_data_->get(i)->contents_->web_contents(),
-        wrapper->extension_tab_helper()->is_app(),
+        tab_contents->extension_tab_helper()->is_app(),
         false); // loading_only
     renderers_[i]->set_is_active(
         static_cast<int>(i) == drag_data_->source_tab_index());
   }
 
   container_ = gtk_window_new(GTK_WINDOW_POPUP);
   SetContainerColorMap();
   gtk_widget_set_app_paintable(container_, TRUE);
   g_signal_connect(container_, "expose-event", G_CALLBACK(OnExposeThunk), this);
   gtk_widget_add_events(container_, GDK_STRUCTURE_MASK);
@@ skipping 377 matching lines @@
     if (!attached_) {
       paint_at = widget_width / kScalingFactor -
           GetWidthInTabStripFromTo(0, index + 1);
     }
   }
 
   cairo_set_source_surface(cr, surface, paint_at, 0);
   cairo_paint(cr);
   cairo_surface_destroy(surface);
 }