OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/views/tabs/tab_strip.h" | 5 #include "chrome/browser/views/tabs/tab_strip.h" |
6 | 6 |
7 #include "app/drag_drop_types.h" | 7 #include "app/drag_drop_types.h" |
8 #include "app/gfx/canvas.h" | 8 #include "app/gfx/canvas.h" |
9 #include "app/gfx/path.h" | 9 #include "app/gfx/path.h" |
10 #include "app/l10n_util.h" | 10 #include "app/l10n_util.h" |
(...skipping 1044 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1055 // Mouse moved quickly out of the tab strip and then into it again, so | 1055 // Mouse moved quickly out of the tab strip and then into it again, so |
1056 // cancel the timer so that the strip doesn't move when the mouse moves | 1056 // cancel the timer so that the strip doesn't move when the mouse moves |
1057 // back over it. | 1057 // back over it. |
1058 resize_layout_factory_.RevokeAll(); | 1058 resize_layout_factory_.RevokeAll(); |
1059 } | 1059 } |
1060 break; | 1060 break; |
1061 } | 1061 } |
1062 } | 1062 } |
1063 #else | 1063 #else |
1064 void TabStrip::WillProcessEvent(GdkEvent* event) { | 1064 void TabStrip::WillProcessEvent(GdkEvent* event) { |
| 1065 } |
| 1066 |
| 1067 void TabStrip::DidProcessEvent(GdkEvent* event) { |
1065 NOTIMPLEMENTED(); | 1068 NOTIMPLEMENTED(); |
1066 } | 1069 } |
1067 #endif | 1070 #endif |
1068 | 1071 |
1069 /////////////////////////////////////////////////////////////////////////////// | 1072 /////////////////////////////////////////////////////////////////////////////// |
1070 // TabStrip, private: | 1073 // TabStrip, private: |
1071 | 1074 |
1072 void TabStrip::Init() { | 1075 void TabStrip::Init() { |
1073 model_->AddObserver(this); | 1076 model_->AddObserver(this); |
1074 newtab_button_ = new NewTabButton(this); | 1077 newtab_button_ = new NewTabButton(this); |
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1548 // If the TabContents being detached was removed as a result of a drag | 1551 // If the TabContents being detached was removed as a result of a drag |
1549 // gesture from its corresponding Tab, we don't want to remove the Tab from | 1552 // gesture from its corresponding Tab, we don't want to remove the Tab from |
1550 // the child list, because if we do so it'll stop receiving events and the | 1553 // the child list, because if we do so it'll stop receiving events and the |
1551 // drag will stall. So we only remove if a drag isn't active, or the Tab | 1554 // drag will stall. So we only remove if a drag isn't active, or the Tab |
1552 // was for some other TabContents. | 1555 // was for some other TabContents. |
1553 if (!IsDragSessionActive() || !drag_controller_->IsDragSourceTab(removed)) { | 1556 if (!IsDragSessionActive() || !drag_controller_->IsDragSourceTab(removed)) { |
1554 removed->GetParent()->RemoveChildView(removed); | 1557 removed->GetParent()->RemoveChildView(removed); |
1555 delete removed; | 1558 delete removed; |
1556 } | 1559 } |
1557 } | 1560 } |
OLD | NEW |