summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-18 17:03:14 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-18 17:03:14 +0000
commitc6d705d0c659bbd9b8f5b59ab3ab79dbd07dc242 (patch)
tree58c7bc081f80af5dcad8cd02f8077d22fc82156f
parent25e8fe9e743e764b7fa05d66b4c0d43517e23b0f (diff)
downloadchromium_src-c6d705d0c659bbd9b8f5b59ab3ab79dbd07dc242.zip
chromium_src-c6d705d0c659bbd9b8f5b59ab3ab79dbd07dc242.tar.gz
chromium_src-c6d705d0c659bbd9b8f5b59ab3ab79dbd07dc242.tar.bz2
Land 12007 for yusukes. Original patch here: http://codereview.chromium.org/115451 .
BUG=http://crbug.com/12007 TEST=see bug Review URL: http://codereview.chromium.org/113531 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16290 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/views/tabs/dragged_tab_view.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/views/tabs/dragged_tab_view.cc b/chrome/browser/views/tabs/dragged_tab_view.cc
index 695bcdd..87b96c45 100644
--- a/chrome/browser/views/tabs/dragged_tab_view.cc
+++ b/chrome/browser/views/tabs/dragged_tab_view.cc
@@ -149,12 +149,14 @@ void DraggedTabView::AnimationCanceled(const Animation* animation) {
// DraggedTabView, views::View overrides:
void DraggedTabView::Paint(gfx::Canvas* canvas) {
- if (!show_contents_on_drag_) {
- PaintFocusRect(canvas);
- } else if (attached_) {
+ if (attached_) {
PaintAttachedTab(canvas);
} else {
- PaintDetachedView(canvas);
+ if (show_contents_on_drag_) {
+ PaintDetachedView(canvas);
+ } else {
+ PaintFocusRect(canvas);
+ }
}
}