| Index: chrome/browser/ui/gtk/tabs/drag_data.h
|
| diff --git a/chrome/browser/ui/gtk/tabs/drag_data.h b/chrome/browser/ui/gtk/tabs/drag_data.h
|
| index faf7b4232465525037b4417036a3523e693a321c..0e5688aa79b3f159042ef244c05db1d81a321121 100644
|
| --- a/chrome/browser/ui/gtk/tabs/drag_data.h
|
| +++ b/chrome/browser/ui/gtk/tabs/drag_data.h
|
| @@ -11,7 +11,6 @@
|
| #include "base/basictypes.h"
|
|
|
| class TabContents;
|
| -typedef TabContents TabContentsWrapper;
|
| class TabGtk;
|
|
|
| namespace content {
|
| @@ -23,7 +22,7 @@ struct DraggedTabData {
|
| public:
|
| DraggedTabData();
|
| DraggedTabData(TabGtk* tab,
|
| - TabContentsWrapper* contents,
|
| + TabContents* contents,
|
| content::WebContentsDelegate* original_delegate,
|
| int source_model_index,
|
| bool pinned,
|
| @@ -37,8 +36,8 @@ struct DraggedTabData {
|
| // The tab being dragged.
|
| TabGtk* tab_;
|
|
|
| - // The TabContentsWrapper being dragged.
|
| - TabContentsWrapper* contents_;
|
| + // The TabContents being dragged.
|
| + TabContents* contents_;
|
|
|
| // The original content::WebContentsDelegate of |contents|, before it was
|
| // detached from the browser window. We store this so that we can forward
|
| @@ -91,7 +90,7 @@ class DragData {
|
| int non_mini_tab_count() const { return non_mini_tab_count_; }
|
|
|
| // Convenience for |source_tab_drag_data()->contents_|.
|
| - TabContentsWrapper* GetSourceTabContentsWrapper();
|
| + TabContents* GetSourceTabContents();
|
|
|
| // Convenience for |source_tab_drag_data()->contents_->web_contents()|.
|
| content::WebContents* GetSourceWebContents();
|
|
|