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

chrome/browser/views/frame/browser_frame_win.cc

 // 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.
 
 #include "chrome/browser/views/frame/browser_frame_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 
 #include "app/resource_bundle.h"
@@ skipping 46 matching lines @@
   WindowWin::Init(NULL, gfx::Rect());
 }
 
 BrowserFrameWin::~BrowserFrameWin() {
 }
 
 views::Window* BrowserFrameWin::GetWindow() {
   return this;
 }
 
-void BrowserFrameWin::TabStripCreated(TabStrip* tabstrip) {
+void BrowserFrameWin::TabStripCreated(TabStripWrapper* tabstrip) {
   root_view_->set_tabstrip(tabstrip);
 }
 
 int BrowserFrameWin::GetMinimizeButtonOffset() const {
   TITLEBARINFOEX titlebar_info;
   titlebar_info.cbSize = sizeof(TITLEBARINFOEX);
   SendMessage(GetNativeView(), WM_GETTITLEBARINFOEX, 0, (WPARAM)&titlebar_info);
 
   CPoint minimize_button_corner(titlebar_info.rgrect[2].left,
                                 titlebar_info.rgrect[2].top);
   MapWindowPoints(HWND_DESKTOP, GetNativeView(), &minimize_button_corner, 1);
 
   return minimize_button_corner.x;
 }
 
-gfx::Rect BrowserFrameWin::GetBoundsForTabStrip(TabStrip* tabstrip) const {
+gfx::Rect BrowserFrameWin::GetBoundsForTabStrip(TabStripWrapper* tabstrip) const {
   return browser_frame_view_->GetBoundsForTabStrip(tabstrip);
 }
 
 void BrowserFrameWin::UpdateThrobber(bool running) {
   browser_frame_view_->UpdateThrobber(running);
 }
 
 void BrowserFrameWin::ContinueDraggingDetachedTab() {
   detached_drag_mode_ = true;
 
@@ skipping 38 matching lines @@
   drop_tabstrip_ = NULL;
   browser_view_->WindowMoveOrResizeStarted();
 }
 
 void BrowserFrameWin::OnExitSizeMove() {
   if (TabStrip2::Enabled()) {
     if (detached_drag_mode_) {
       detached_drag_mode_ = false;
       if (drop_tabstrip_) {
         gfx::Point screen_point = views::Screen::GetCursorScreenPoint();
-        BrowserTabStrip* tabstrip = browser_view_->bts();
+        BrowserTabStrip* tabstrip = browser_view_->tabstrip()->AsBrowserTabStrip();
         gfx::Rect tsb = tabstrip->GetDraggedTabScreenBounds(screen_point);
         drop_tabstrip_->AttachTab(tabstrip->DetachTab(0), screen_point, tsb);
       } else {
         UpdateWindowAlphaForTabDragging(detached_drag_mode_);
-        browser_view_->bts()->SendDraggedTabHome();
+        browser_view_->tabstrip()->AsBrowserTabStrip()->SendDraggedTabHome();
       }
     }
   }
   WidgetWin::OnExitSizeMove();
 }
 
 void BrowserFrameWin::OnInitMenuPopup(HMENU menu, UINT position,
                                       BOOL is_system_menu) {
   browser_view_->PrepareToRunSystemMenu(menu);
 }
@@ skipping 113 matching lines @@
 
       // We check to see if the mouse cursor is in the magnetism zone of another
       // visible TabStrip. If so, we should dock to it.
       std::set<HWND> ignore_windows;
       ignore_windows.insert(GetNativeWindow());
 
       gfx::Point screen_point = views::Screen::GetCursorScreenPoint();
       HWND local_window =
           DockInfo::GetLocalProcessWindowAtPoint(screen_point, ignore_windows);
       if (local_window) {
-        drop_tabstrip_ =
-            BrowserView::GetBrowserViewForNativeWindow(local_window)->bts();
+        BrowserView* browser_view =
+            BrowserView::GetBrowserViewForNativeWindow(local_window);
+        drop_tabstrip_ = browser_view->tabstrip()->AsBrowserTabStrip();
         if (TabStrip2::IsDragRearrange(drop_tabstrip_, screen_point)) {
           ReleaseCapture();
           return;
         }
       }
       drop_tabstrip_ = NULL;
     }
   }
 
   // Windows lies to us about the position of the minimize button before a
@@ skipping 79 matching lines @@
     // more "transparent" look.
     ::SetWindowLong(frame_hwnd, GWL_STYLE,
                     saved_window_style_ & ~WS_CAPTION);
     SetLayeredWindowAttributes(frame_hwnd, RGB(0xFF, 0xFF, 0xFF),
                                kTabDragWindowAlpha, LWA_ALPHA);
   } else {
     ::SetWindowLong(frame_hwnd, GWL_STYLE, saved_window_style_);
     ::SetWindowLong(frame_hwnd, GWL_EXSTYLE, saved_window_ex_style_);
   }
 }