| Index: chrome/browser/gtk/tabs/dragged_tab_gtk.h
 | 
| diff --git a/chrome/browser/gtk/tabs/dragged_tab_gtk.h b/chrome/browser/gtk/tabs/dragged_tab_gtk.h
 | 
| index ae4c0f197c8117a2c6f3398a07e8055b6d64332c..501f757234ffce8052f546b4ae6778acd4c31093 100644
 | 
| --- a/chrome/browser/gtk/tabs/dragged_tab_gtk.h
 | 
| +++ b/chrome/browser/gtk/tabs/dragged_tab_gtk.h
 | 
| @@ -1,4 +1,4 @@
 | 
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 | 
| +// Copyright (c) 2011 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.
 | 
|  
 | 
| @@ -6,142 +6,7 @@
 | 
|  #define CHROME_BROWSER_GTK_TABS_DRAGGED_TAB_GTK_H_
 | 
|  #pragma once
 | 
|  
 | 
| -#include <gtk/gtk.h>
 | 
| -
 | 
| -#include "base/callback.h"
 | 
| -#include "base/scoped_ptr.h"
 | 
| -#include "base/task.h"
 | 
| -#include "gfx/canvas.h"
 | 
| -#include "gfx/point.h"
 | 
| -#include "gfx/rect.h"
 | 
| -#include "gfx/size.h"
 | 
| -#include "ui/base/animation/animation_delegate.h"
 | 
| -#include "ui/base/animation/slide_animation.h"
 | 
| -
 | 
| -class TabContents;
 | 
| -class TabRendererGtk;
 | 
| -
 | 
| -class DraggedTabGtk : public ui::AnimationDelegate {
 | 
| - public:
 | 
| -  DraggedTabGtk(TabContents* datasource,
 | 
| -                const gfx::Point& mouse_tab_offset,
 | 
| -                const gfx::Size& contents_size,
 | 
| -                bool mini);
 | 
| -  virtual ~DraggedTabGtk();
 | 
| -
 | 
| -  // Moves the dragged tab to the appropriate location given the mouse
 | 
| -  // pointer at |screen_point|.
 | 
| -  void MoveTo(const gfx::Point& screen_point);
 | 
| -
 | 
| -  // Sets the offset of the mouse from the upper left corner of the tab.
 | 
| -  void set_mouse_tab_offset(const gfx::Point& offset) {
 | 
| -    mouse_tab_offset_ = offset;
 | 
| -  }
 | 
| -
 | 
| -  // Notifies the dragged tab that it has become attached to a tabstrip.
 | 
| -  void Attach(int selected_width);
 | 
| -
 | 
| -  // Resizes the dragged tab to a width of |width|.
 | 
| -  void Resize(int width);
 | 
| -
 | 
| -  // Notifies the dragged tab that it has been detached from a tabstrip.
 | 
| -  void Detach();
 | 
| -
 | 
| -  // Notifies the dragged tab that it should update itself.
 | 
| -  void Update();
 | 
| -
 | 
| -  // Animates the dragged tab to the specified bounds, then calls back to
 | 
| -  // |callback|.
 | 
| -  typedef Callback0::Type AnimateToBoundsCallback;
 | 
| -  void AnimateToBounds(const gfx::Rect& bounds,
 | 
| -                       AnimateToBoundsCallback* callback);
 | 
| -
 | 
| -  // Returns the size of the dragged tab. Used when attaching to a tabstrip
 | 
| -  // to determine where to place the tab in the attached tabstrip.
 | 
| -  const gfx::Size& attached_tab_size() const { return attached_tab_size_; }
 | 
| -
 | 
| -  GtkWidget* widget() const { return container_; }
 | 
| -
 | 
| - private:
 | 
| -  // Overridden from ui::AnimationDelegate:
 | 
| -  virtual void AnimationProgressed(const ui::Animation* animation);
 | 
| -  virtual void AnimationEnded(const ui::Animation* animation);
 | 
| -  virtual void AnimationCanceled(const ui::Animation* animation);
 | 
| -
 | 
| -  // Arranges the contents of the dragged tab.
 | 
| -  void Layout();
 | 
| -
 | 
| -  // Gets the preferred size of the dragged tab.
 | 
| -  gfx::Size GetPreferredSize();
 | 
| -
 | 
| -  // Resizes the container to fit the content for the current attachment mode.
 | 
| -  void ResizeContainer();
 | 
| -
 | 
| -  // Utility for scaling a size by the current scaling factor.
 | 
| -  int ScaleValue(int value);
 | 
| -
 | 
| -  // Returns the bounds of the container window.
 | 
| -  gfx::Rect bounds() const;
 | 
| -
 | 
| -  // Sets the color map of the container window to allow the window to be
 | 
| -  // transparent.
 | 
| -  void SetContainerColorMap();
 | 
| -
 | 
| -  // Sets full transparency for the container window.  This is used if
 | 
| -  // compositing is available for the screen.
 | 
| -  void SetContainerTransparency();
 | 
| -
 | 
| -  // Sets the shape mask for the container window to emulate a transparent
 | 
| -  // container window.  This is used if compositing is not available for the
 | 
| -  // screen.
 | 
| -  // |surface| represents the tab only (not the render view).
 | 
| -  void SetContainerShapeMask(cairo_surface_t* surface);
 | 
| -
 | 
| -  // expose-event handler that notifies when the tab needs to be redrawn.
 | 
| -  static gboolean OnExposeEvent(GtkWidget* widget, GdkEventExpose* event,
 | 
| -                                DraggedTabGtk* dragged_tab);
 | 
| -
 | 
| -  // The tab contents that the dragged tab contains.
 | 
| -  TabContents* data_source_;
 | 
| -
 | 
| -  // The window that contains the dragged tab or tab contents.
 | 
| -  GtkWidget* container_;
 | 
| -
 | 
| -  // The fixed widget that we use to contain the tab renderer so that the
 | 
| -  // tab widget won't be resized.
 | 
| -  GtkWidget* fixed_;
 | 
| -
 | 
| -  // The renderer that paints the dragged tab.
 | 
| -  scoped_ptr<TabRendererGtk> renderer_;
 | 
| -
 | 
| -  // True if the view is currently attached to a tabstrip. Controls rendering
 | 
| -  // and sizing modes.
 | 
| -  bool attached_;
 | 
| -
 | 
| -  // The unscaled offset of the mouse from the top left of the dragged tab.
 | 
| -  // This is used to maintain an appropriate offset for the mouse pointer when
 | 
| -  // dragging scaled and unscaled representations, and also to calculate the
 | 
| -  // position of detached windows.
 | 
| -  gfx::Point mouse_tab_offset_;
 | 
| -
 | 
| -  // The size of the tab renderer when the dragged tab is attached to a
 | 
| -  // tabstrip.
 | 
| -  gfx::Size attached_tab_size_;
 | 
| -
 | 
| -  // The dimensions of the TabContents being dragged.
 | 
| -  gfx::Size contents_size_;
 | 
| -
 | 
| -  // The animation used to slide the attached tab to its final location.
 | 
| -  ui::SlideAnimation close_animation_;
 | 
| -
 | 
| -  // A callback notified when the animation is complete.
 | 
| -  scoped_ptr<Callback0::Type> animation_callback_;
 | 
| -
 | 
| -  // The start and end bounds of the animation sequence.
 | 
| -  gfx::Rect animation_start_bounds_;
 | 
| -  gfx::Rect animation_end_bounds_;
 | 
| -
 | 
| -  DISALLOW_COPY_AND_ASSIGN(DraggedTabGtk);
 | 
| -};
 | 
| +#include "chrome/browser/ui/gtk/tabs/dragged_tab_gtk.h"
 | 
| +// TODO(msw): remove this file once all includes have been updated.
 | 
|  
 | 
|  #endif  // CHROME_BROWSER_GTK_TABS_DRAGGED_TAB_GTK_H_
 | 
| 
 |