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

Side by Side Diff: chrome/browser/views/tabs/tab_strip.cc

Issue 40124: Revert r9953 since it caused regressions like: (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Created 11 years, 9 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/views/tabs/tab_renderer.cc ('k') | chrome/views/event.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/gfx/size.h" 7 #include "base/gfx/size.h"
8 #include "chrome/browser/metrics/user_metrics.h" 8 #include "chrome/browser/metrics/user_metrics.h"
9 #include "chrome/browser/profile.h" 9 #include "chrome/browser/profile.h"
10 #include "chrome/browser/tab_contents/tab_contents.h" 10 #include "chrome/browser/tab_contents/tab_contents.h"
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 } 496 }
497 497
498 bool TabStrip::PointIsWithinWindowCaption(const gfx::Point& point) { 498 bool TabStrip::PointIsWithinWindowCaption(const gfx::Point& point) {
499 views::View* v = GetViewForPoint(point); 499 views::View* v = GetViewForPoint(point);
500 500
501 // If there is no control at this location, claim the hit was in the title 501 // If there is no control at this location, claim the hit was in the title
502 // bar to get a move action. 502 // bar to get a move action.
503 if (v == this) 503 if (v == this)
504 return true; 504 return true;
505 505
506 // If the point is within the bounds of a Tab, the point can be considered
507 // part of the caption if there are no available drag operations for the Tab.
508 if (v->GetClassName() == Tab::kTabClassName && !HasAvailableDragActions())
509 return true;
510
506 // Check to see if the point is within the non-button parts of the new tab 511 // Check to see if the point is within the non-button parts of the new tab
507 // button. The button has a non-rectangular shape, so if it's not in the 512 // button. The button has a non-rectangular shape, so if it's not in the
508 // visual portions of the button we treat it as a click to the caption. 513 // visual portions of the button we treat it as a click to the caption.
509 gfx::Point point_in_newtab_coords(point); 514 gfx::Point point_in_newtab_coords(point);
510 View::ConvertPointToView(this, newtab_button_, &point_in_newtab_coords); 515 View::ConvertPointToView(this, newtab_button_, &point_in_newtab_coords);
511 if (newtab_button_->bounds().Contains(point) && 516 if (newtab_button_->bounds().Contains(point) &&
512 !newtab_button_->HitTest(point_in_newtab_coords)) { 517 !newtab_button_->HitTest(point_in_newtab_coords)) {
513 return true; 518 return true;
514 } 519 }
515 520
(...skipping 1006 matching lines...) Expand 10 before | Expand all | Expand 10 after
1522 // If the TabContents being detached was removed as a result of a drag 1527 // If the TabContents being detached was removed as a result of a drag
1523 // gesture from its corresponding Tab, we don't want to remove the Tab from 1528 // gesture from its corresponding Tab, we don't want to remove the Tab from
1524 // the child list, because if we do so it'll stop receiving events and the 1529 // the child list, because if we do so it'll stop receiving events and the
1525 // drag will stall. So we only remove if a drag isn't active, or the Tab 1530 // drag will stall. So we only remove if a drag isn't active, or the Tab
1526 // was for some other TabContents. 1531 // was for some other TabContents.
1527 if (!IsDragSessionActive() || !drag_controller_->IsDragSourceTab(removed)) { 1532 if (!IsDragSessionActive() || !drag_controller_->IsDragSourceTab(removed)) {
1528 removed->GetParent()->RemoveChildView(removed); 1533 removed->GetParent()->RemoveChildView(removed);
1529 delete removed; 1534 delete removed;
1530 } 1535 }
1531 } 1536 }
OLDNEW
« no previous file with comments | « chrome/browser/views/tabs/tab_renderer.cc ('k') | chrome/views/event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698