summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-04 22:23:07 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-04 22:23:07 +0000
commit4c9b24cce158bb1ce97c34af55ad865b86499719 (patch)
treec147ac2d85c1008718adcecf77925940bd416b50 /chrome/browser
parent5be424c82a3ea9ec7550a3d2f00bc2ce57a88583 (diff)
downloadchromium_src-4c9b24cce158bb1ce97c34af55ad865b86499719.zip
chromium_src-4c9b24cce158bb1ce97c34af55ad865b86499719.tar.gz
chromium_src-4c9b24cce158bb1ce97c34af55ad865b86499719.tar.bz2
Revert r9953 since it caused regressions like:
http://crbug.com/8287 Eyeballing the code in RootView, this change seems wrong. Review URL: http://codereview.chromium.org/40124 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10929 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/views/tabs/tab_renderer.cc1
-rw-r--r--chrome/browser/views/tabs/tab_strip.cc5
2 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc
index ede0848..932fd32 100644
--- a/chrome/browser/views/tabs/tab_renderer.cc
+++ b/chrome/browser/views/tabs/tab_renderer.cc
@@ -185,6 +185,7 @@ class TabCloseButton : public views::Button {
virtual ~TabCloseButton() {}
virtual bool OnMousePressed(const views::MouseEvent& event) {
+ LOG(WARNING) << "MOUSE PRESSED";
return !event.IsOnlyMiddleMouseButton();
}
diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc
index c256a82..cfb9a50 100644
--- a/chrome/browser/views/tabs/tab_strip.cc
+++ b/chrome/browser/views/tabs/tab_strip.cc
@@ -503,6 +503,11 @@ bool TabStrip::PointIsWithinWindowCaption(const gfx::Point& point) {
if (v == this)
return true;
+ // If the point is within the bounds of a Tab, the point can be considered
+ // part of the caption if there are no available drag operations for the Tab.
+ if (v->GetClassName() == Tab::kTabClassName && !HasAvailableDragActions())
+ return true;
+
// Check to see if the point is within the non-button parts of the new tab
// button. The button has a non-rectangular shape, so if it's not in the
// visual portions of the button we treat it as a click to the caption.