Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1267)

Unified Diff: chrome/browser/views/frame/browser_frame_win.cc

Issue 155242: Add temporary TabStripWrapper interface that is implemented by both TabStrip ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/views/frame/browser_frame_win.cc
===================================================================
--- chrome/browser/views/frame/browser_frame_win.cc (revision 20183)
+++ chrome/browser/views/frame/browser_frame_win.cc (working copy)
@@ -64,7 +64,7 @@
return this;
}
-void BrowserFrameWin::TabStripCreated(TabStrip* tabstrip) {
+void BrowserFrameWin::TabStripCreated(TabStripWrapper* tabstrip) {
root_view_->set_tabstrip(tabstrip);
}
@@ -80,7 +80,7 @@
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);
}
@@ -139,12 +139,12 @@
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();
}
}
}
@@ -278,8 +278,9 @@
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;
« no previous file with comments | « chrome/browser/views/frame/browser_frame_win.h ('k') | chrome/browser/views/frame/browser_non_client_frame_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698