| Index: ui/views/controls/scrollbar/base_scroll_bar.cc
|
| diff --git a/ui/views/controls/scrollbar/base_scroll_bar.cc b/ui/views/controls/scrollbar/base_scroll_bar.cc
|
| index 54d4b4434f4203f10fe1d23e4fd69d77b16e2ede..a62636466a04994e2074dce9082824b5de53893e 100644
|
| --- a/ui/views/controls/scrollbar/base_scroll_bar.cc
|
| +++ b/ui/views/controls/scrollbar/base_scroll_bar.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -203,8 +203,8 @@ enum ScrollBarContextMenuCommands {
|
| };
|
|
|
| void BaseScrollBar::ShowContextMenuForView(View* source,
|
| - const gfx::Point& p,
|
| - bool is_mouse_gesture) {
|
| + const gfx::Point& p,
|
| + GestureType gesture_type) {
|
| Widget* widget = GetWidget();
|
| gfx::Rect widget_bounds = widget->GetWindowScreenBounds();
|
| gfx::Point temp_pt(p.x() - widget_bounds.x(), p.y() - widget_bounds.y());
|
| @@ -224,8 +224,8 @@ void BaseScrollBar::ShowContextMenuForView(View* source,
|
| menu->AppendSeparator();
|
| menu->AppendDelegateMenuItem(ScrollBarContextMenuCommand_ScrollPrev);
|
| menu->AppendDelegateMenuItem(ScrollBarContextMenuCommand_ScrollNext);
|
| - if (menu_runner_->RunMenuAt(GetWidget(), NULL, gfx::Rect(p, gfx::Size(0, 0)),
|
| - MenuItemView::TOPLEFT, MenuRunner::HAS_MNEMONICS) ==
|
| + if (menu_runner_->RunMenuAt(GetWidget(), NULL, gfx::Rect(p, gfx::Size()),
|
| + MenuItemView::TOPLEFT, MenuRunner::HAS_MNEMONICS) ==
|
| MenuRunner::MENU_DELETED)
|
| return;
|
| }
|
|
|