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

Unified Diff: chrome/browser/ui/views/tabs/dragged_tab_controller.cc

Issue 4694008: Make pink's TabContentsWrapper change compile on Windows.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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/ui/views/tabs/dragged_tab_controller.cc
===================================================================
--- chrome/browser/ui/views/tabs/dragged_tab_controller.cc (revision 66453)
+++ chrome/browser/ui/views/tabs/dragged_tab_controller.cc (working copy)
@@ -474,7 +474,8 @@
const NotificationSource& source,
const NotificationDetails& details) {
DCHECK(type == NotificationType::TAB_CONTENTS_DESTROYED);
- DCHECK(Source<TabContents>(source).ptr() == dragged_contents_);
+ DCHECK(Source<TabContents>(source).ptr() ==
+ dragged_contents_->tab_contents());
EndDragImpl(TAB_DESTROYED);
}
@@ -576,11 +577,12 @@
}
}
-void DraggedTabController::SetDraggedContents(TabContents* new_contents) {
+void DraggedTabController::SetDraggedContents(
+ TabContentsWrapper* new_contents) {
if (dragged_contents_) {
registrar_.Remove(this,
NotificationType::TAB_CONTENTS_DESTROYED,
- Source<TabContents>(dragged_contents_));
+ Source<TabContents>(dragged_contents_->tab_contents()));
if (original_delegate_)
dragged_contents_->set_delegate(original_delegate_);
}
@@ -589,7 +591,7 @@
if (dragged_contents_) {
registrar_.Add(this,
NotificationType::TAB_CONTENTS_DESTROYED,
- Source<TabContents>(dragged_contents_));
+ Source<TabContents>(dragged_contents_->tab_contents()));
// We need to be the delegate so we receive messages about stuff,
// otherwise our dragged_contents() may be replaced and subsequently
@@ -832,7 +834,7 @@
original_delegate_ = NULL;
// Return the TabContents' to normalcy.
- dragged_contents_->set_capturing_contents(false);
+ dragged_contents_->tab_contents()->set_capturing_contents(false);
// Inserting counts as a move. We don't want the tabs to jitter when the
// user moves the tab immediately after attaching it.
@@ -871,7 +873,7 @@
void DraggedTabController::Detach() {
// Prevent the TabContents' HWND from being hidden by any of the model
// operations performed during the drag.
- dragged_contents_->set_capturing_contents(true);
+ dragged_contents_->tab_contents()->set_capturing_contents(true);
// Update the Model.
TabRendererData tab_data = attached_tab_->data();
@@ -892,8 +894,8 @@
// Set up the photo booth to start capturing the contents of the dragged
// TabContents.
if (!photobooth_.get()) {
- photobooth_.reset(
- NativeViewPhotobooth::Create(dragged_contents_->GetNativeView()));
+ photobooth_.reset(NativeViewPhotobooth::Create(
+ dragged_contents_->tab_contents()->GetNativeView()));
}
// Create the dragged view.
@@ -1227,7 +1229,7 @@
void DraggedTabController::EnsureDraggedView(const TabRendererData& data) {
if (!view_.get()) {
gfx::Rect tab_bounds;
- dragged_contents_->GetContainerBounds(&tab_bounds);
+ dragged_contents_->tab_contents()->GetContainerBounds(&tab_bounds);
BaseTab* renderer = source_tabstrip_->CreateTabForDragging();
renderer->SetData(data);
// DraggedTabView takes ownership of renderer.

Powered by Google App Engine
This is Rietveld 408576698