Make pink's TabContentsWrapper change compile on Windows....

chrome/browser/gtk/tabs/dragged_tab_controller_gtk.cc

 // Copyright (c) 2010 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/gtk/tabs/dragged_tab_controller_gtk.h"
 
 #include <algorithm>
 
 #include "base/callback.h"
 #include "chrome/browser/gtk/browser_window_gtk.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/gtk/tabs/dragged_tab_gtk.h"
 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents_wrapper.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/notification_service.h"
 
 namespace {
 
 // Delay, in ms, during dragging before we bring a window to front.
 const int kBringToFrontDelay = 750;
 
 // Used to determine how far a tab must obscure another tab in order to swap
@@ skipping 57 matching lines @@
   }
 }
 
 bool DraggedTabControllerGtk::EndDrag(bool canceled) {
   return EndDragImpl(canceled ? CANCELED : NORMAL);
 }
 
 TabGtk* DraggedTabControllerGtk::GetDragSourceTabForContents(
     TabContents* contents) const {
   if (attached_tabstrip_ == source_tabstrip_)
-    return contents == dragged_contents_ ? source_tab_ : NULL;
+    return contents == dragged_contents_->tab_contents() ? source_tab_ : NULL;
   return NULL;
 }
 
 bool DraggedTabControllerGtk::IsDragSourceTab(const TabGtk* tab) const {
   return source_tab_ == tab;
 }
 
 bool DraggedTabControllerGtk::IsTabDetached(const TabGtk* tab) const {
   if (!IsDragSourceTab(tab))
     return false;
@@ skipping 84 matching lines @@
   // Ignored.
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DraggedTabControllerGtk, NotificationObserver implementation:
 
 void DraggedTabControllerGtk::Observe(NotificationType type,
                                    const NotificationSource& source,
                                    const NotificationDetails& details) {
   DCHECK(type == NotificationType::TAB_CONTENTS_DESTROYED);
-  DCHECK(Source<TabContents>(source).ptr() == dragged_contents_);
+  DCHECK(Source<TabContentsWrapper>(source).ptr() == dragged_contents_);
   EndDragImpl(TAB_DESTROYED);
 }
 
 void DraggedTabControllerGtk::InitWindowCreatePoint() {
   window_create_point_.SetPoint(mouse_offset_.x(), mouse_offset_.y());
 }
 
 gfx::Point DraggedTabControllerGtk::GetWindowCreatePoint() const {
   gfx::Point cursor_point = GetCursorScreenPoint();
   return gfx::Point(cursor_point.x() - window_create_point_.x(),
                     cursor_point.y() - window_create_point_.y());
 }
 
-void DraggedTabControllerGtk::SetDraggedContents(TabContents* new_contents) {
+void DraggedTabControllerGtk::SetDraggedContents(
+    TabContentsWrapper* new_contents) {
   if (dragged_contents_) {
     registrar_.Remove(this,
                       NotificationType::TAB_CONTENTS_DESTROYED,
-                      Source<TabContents>(dragged_contents_));
+                      Source<TabContentsWrapper>(dragged_contents_));
     if (original_delegate_)
       dragged_contents_->set_delegate(original_delegate_);
   }
   original_delegate_ = NULL;
   dragged_contents_ = new_contents;
   if (dragged_contents_) {
     registrar_.Add(this,
                    NotificationType::TAB_CONTENTS_DESTROYED,
-                   Source<TabContents>(dragged_contents_));
+                   Source<TabContentsWrapper>(dragged_contents_));
 
     // We need to be the delegate so we receive messages about stuff,
     // otherwise our dragged_contents() may be replaced and subsequently
     // collected/destroyed while the drag is in process, leading to
     // nasty crashes.
     original_delegate_ = dragged_contents_->delegate();
     dragged_contents_->set_delegate(this);
   }
 }
 
@@ skipping 137 matching lines @@
   if (!tab) {
     // There is no tab in |attached_tabstrip| that corresponds to the dragged
     // TabContents. We must now create one.
 
     // Remove ourselves as the delegate now that the dragged TabContents is
     // being inserted back into a Browser.
     dragged_contents_->set_delegate(NULL);
     original_delegate_ = NULL;
 
     // Return the TabContents' to normalcy.
-    dragged_contents_->set_capturing_contents(false);
+    dragged_contents_->tab_contents()->set_capturing_contents(false);
 
     // We need to ask the tabstrip we're attached to ensure that the ideal
     // bounds for all its tabs are correctly generated, because the calculation
     // in GetInsertionIndexForDraggedBounds needs them to be to figure out the
     // appropriate insertion index.
     attached_tabstrip_->GenerateIdealBounds();
 
     // Inserting counts as a move. We don't want the tabs to jitter when the
     // user moves the tab immediately after attaching it.
     last_move_screen_x_ = screen_point.x();
@@ skipping 284 matching lines @@
     new_browser->window()->Show();
     CleanUpHiddenFrame();
   }
 
   return destroy_immediately;
 }
 
 void DraggedTabControllerGtk::EnsureDraggedTab() {
   if (!dragged_tab_.get()) {
     gfx::Rect rect;
-    dragged_contents_->GetContainerBounds(&rect);
+    dragged_contents_->tab_contents()->GetContainerBounds(&rect);
 
-    dragged_tab_.reset(new DraggedTabGtk(dragged_contents_, mouse_offset_,
-                                         rect.size(), mini_));
+    dragged_tab_.reset(new DraggedTabGtk(dragged_contents_->tab_contents(),
+                                         mouse_offset_, rect.size(), mini_));
   }
 }
 
 gfx::Point DraggedTabControllerGtk::GetCursorScreenPoint() const {
   // Get default display and screen.
   GdkDisplay* display = gdk_display_get_default();
 
   // Get cursor position.
   int x, y;
   gdk_display_get_pointer(display, NULL, &x, &y, NULL);
@@ skipping 74 matching lines @@
     gfx::NativeView dragged_tab = dragged_tab_->widget();
     dock_windows_.insert(dragged_tab);
     window = DockInfo::GetLocalProcessWindowAtPoint(GetCursorScreenPoint(),
                                                     dock_windows_);
     dock_windows_.erase(dragged_tab);
   }
 
   if (window)
     gtk_window_present(GTK_WINDOW(window));
 }