Makes it so tab_strip can compile on linux. Most differences are due...

chrome/browser/views/tabs/tab_strip.h

 // Copyright (c) 2006-2008 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.
 
-#ifndef CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_H__
-#define CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_H__
+#ifndef CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_H_
+#define CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_H_
 
 #include "base/gfx/point.h"
+#include "base/message_loop.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/views/tabs/tab.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/menu/menu.h"
 #include "views/view.h"
+#if defined(OS_WIN)
 #include "views/widget/widget_win.h"
+#endif
 
 class DraggedTabController;
 class ScopedMouseCloseWidthCalculator;
 class TabStripModel;
 
 namespace views {
 class ImageView;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 109 matching lines @@
   virtual void StopAllHighlighting();
   virtual void MaybeStartDrag(Tab* tab, const views::MouseEvent& event);
   virtual void ContinueDrag(const views::MouseEvent& event);
   virtual bool EndDrag(bool canceled);
   virtual bool HasAvailableDragActions() const;
 
   // views::ButtonListener implementation:
   virtual void ButtonPressed(views::Button* sender);
 
   // MessageLoop::Observer implementation:
+#if defined(OS_WIN)
   virtual void WillProcessMessage(const MSG& msg);
   virtual void DidProcessMessage(const MSG& msg);
+#else
+  virtual void WillProcessEvent(GdkEvent* event);
+#endif
 
  private:
+  class InsertTabAnimation;
+  class MoveTabAnimation;
+  class RemoveTabAnimation;
+  class ResizeLayoutAnimation;
+  class TabAnimation;
+
   friend class DraggedTabController;
   friend class InsertTabAnimation;
   friend class MoveTabAnimation;
   friend class RemoveTabAnimation;
   friend class ResizeLayoutAnimation;
-  friend class SuspendAnimationsTask;
   friend class TabAnimation;
 
   TabStrip();
   void Init();
 
   // Retrieves the Tab at the specified index. Take care in using this, you may
   // need to use GetTabAtAdjustForAnimation.
   Tab* GetTabAt(int index) const;
 
   // Returns the tab at the specified index. If a remove animation is on going
@@ skipping 80 matching lines @@
   void StartMoveTabAnimation(int from_index, int to_index);
 
   // Returns true if detach or select changes in the model should be reflected
   // in the TabStrip. This returns false if we're closing all tabs in the
   // TabStrip and so we should prevent updating. This is not const because we
   // use this as a signal to cancel any active animations.
   bool CanUpdateDisplay();
 
   // Notifies the TabStrip that the specified TabAnimation has completed.
   // Optionally a full Layout will be performed, specified by |layout|.
-  class TabAnimation;
   void FinishAnimation(TabAnimation* animation, bool layout);
 
   // Finds the index of the TabContents corresponding to |tab| in our
   // associated TabStripModel, or -1 if there is none (e.g. the specified |tab|
   // is being animated closed).
   int GetIndexOfTab(const Tab* tab) const;
 
   // Calculates the available width for tabs, assuming a Tab is to be closed.
   int GetAvailableWidthForTabs(Tab* last_tab) const;
 
@@ skipping 59 matching lines @@
     int drop_index;
     bool drop_before;
 
     // Direction the arrow should point in. If true, the arrow is displayed
     // above the tab and points down. If false, the arrow is displayed beneath
     // the tab and points up.
     bool point_down;
 
     // Renders the drop indicator.
     // TODO(beng): should be views::Widget.
+#if defined(OS_WIN)

[Ben Goodger (Google), 2009/05/18 19:25:23]

Move the TODO above under this ifdef

     views::WidgetWin* arrow_window;
+#endif
     views::ImageView* arrow_view;
 
    private:
-    DISALLOW_EVIL_CONSTRUCTORS(DropInfo);
+    DISALLOW_COPY_AND_ASSIGN(DropInfo);
   };
 
   // Valid for the lifetime of a drag over us.
   scoped_ptr<DropInfo> drop_info_;
 
   // The controller for a drag initiated from a Tab. Valid for the lifetime of
   // the drag session.
   scoped_ptr<DraggedTabController> drag_controller_;
 
   // The Tabs we contain, and their last generated "good" bounds.
   struct TabData {
     Tab* tab;
     gfx::Rect ideal_bounds;
   };
   std::vector<TabData> tab_data_;
 
   // The currently running animation.
   scoped_ptr<TabAnimation> active_animation_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(TabStrip);
+  DISALLOW_COPY_AND_ASSIGN(TabStrip);
 };
 
-#endif  // CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_H__
+#endif  // CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_H_