Commit ffbf92d3 authored by mukai@chromium.org's avatar mukai@chromium.org

Do not handle the button click event for the mouse release of dragging launcher item.


BUG=119236
TEST=manually


Review URL: http://codereview.chromium.org/9837001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128247 0039d316-1c4b-4281-b951-d872f2087c98
parent 5db34fa6
......@@ -156,8 +156,8 @@ bool LauncherButton::OnMousePressed(const views::MouseEvent& event) {
}
void LauncherButton::OnMouseReleased(const views::MouseEvent& event) {
host_->MouseReleasedOnButton(this, false);
CustomButton::OnMouseReleased(event);
host_->MouseReleasedOnButton(this, false);
}
void LauncherButton::OnMouseCaptureLost() {
......
......@@ -694,6 +694,10 @@ string16 LauncherView::GetAccessibleName(const views::View* view) {
void LauncherView::ButtonPressed(views::Button* sender,
const views::Event& event) {
// Do not handle mouse release during drag.
if (dragging_)
return;
if (sender == overflow_button_)
ShowOverflowMenu();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment