Add temporary TabStripWrapper interface that is implemented by both TabStrip ...

chrome/browser/views/frame/browser_view.h

 // Copyright (c) 2006-2009 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_FRAME_BROWSER_VIEW_H_
 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
 
 #include <set>
 
 #include "base/gfx/native_widget_types.h"
@@ skipping 13 matching lines @@
 #include "views/controls/menu/simple_menu_model.h"
 #include "views/window/client_view.h"
 #include "views/window/window_delegate.h"
 
 // NOTE: For more information about the objects and files in this directory,
 // view: http://dev.chromium.org/developers/design-documents/browser-window
 
 class BookmarkBarView;
 class Browser;
 class BrowserBubble;
-class BrowserTabStrip;
 class DownloadShelfView;
 class EncodingMenuModel;
 class ExtensionShelf;
 class FullscreenExitBubble;
 class HtmlDialogUIDelegate;
 class InfoBarContainer;
 class LocationBarView;
 class StatusBubbleViews;
 class TabContentsContainer;
-class TabStrip;
+class TabStripWrapper;
 class ToolbarView;
 class ZoomMenuModel;
 
 namespace views {
 class Menu;
 class SingleSplitView;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView
@@ skipping 59 matching lines @@
 
   // Returns the preferred height of the TabStrip. Used to position the OTR
   // avatar icon.
   int GetTabStripHeight() const;
 
   // Returns the bounds of the TabStrip. Used by themed views to determine the
   // offset of IDR_THEME_TOOLBAR.
   gfx::Rect GetTabStripBounds() const;
 
   // Accessor for the TabStrip.
-  TabStrip* tabstrip() const { return tabstrip_; }
-  BrowserTabStrip* bts() const { return bts_; }
+  TabStripWrapper* tabstrip() const { return tabstrip_; }
 
   // Accessor for the ExtensionShelf.
   ExtensionShelf* extension_shelf() const { return extension_shelf_; }
 
   // Returns true if various window components are visible.
   bool IsToolbarVisible() const;
   bool IsTabStripVisible() const;
 
   // Returns true if the profile associated with this Browser window is
   // off the record.
@@ skipping 253 matching lines @@
 
   // The Browser object we are associated with.
   scoped_ptr<Browser> browser_;
 
   // Tool/Info bars that we are currently showing. Used for layout.
   // active_bookmark_bar_ is either NULL, if the bookmark bar isn't showing,
   // or is bookmark_bar_view_ if the bookmark bar is showing.
   views::View* active_bookmark_bar_;
 
   // The TabStrip.
-  TabStrip* tabstrip_;
-
-  // The BrowserTabStrip.
-  BrowserTabStrip* bts_;
+  TabStripWrapper* tabstrip_;
 
   // The Toolbar containing the navigation buttons, menus and the address bar.
   ToolbarView* toolbar_;
 
   // The Bookmark Bar View for this window. Lazily created.
   scoped_ptr<BookmarkBarView> bookmark_bar_view_;
 
   // The download shelf view (view at the bottom of the page).
   scoped_ptr<DownloadShelfView> download_shelf_;
 
@@ skipping 61 matching lines @@
   // A bottom bar for showing extensions.
   ExtensionShelf* extension_shelf_;
 
   typedef std::set<BrowserBubble*> BubbleSet;
   BubbleSet browser_bubbles_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_