| Index: ash/launcher/launcher_view.h
|
| diff --git a/ash/launcher/launcher_view.h b/ash/launcher/launcher_view.h
|
| index 0bee1c960879c7a974d8b1cadd09029c30a167d7..aa59f1e5921cec5b3cf9d0483487b3f86befae5d 100644
|
| --- a/ash/launcher/launcher_view.h
|
| +++ b/ash/launcher/launcher_view.h
|
| @@ -243,11 +243,12 @@ class ASH_EXPORT LauncherView : public views::View,
|
| // The |event_flags| are the flags of the event which triggered this menu.
|
| bool ShowListMenuForView(const LauncherItem& item,
|
| views::View* source,
|
| - int event_flags);
|
| + const ui::Event& event);
|
|
|
| // Overridden from views::ContextMenuController:
|
| virtual void ShowContextMenuForView(views::View* source,
|
| - const gfx::Point& point) OVERRIDE;
|
| + const gfx::Point& point,
|
| + ui::MenuSourceType source_type) OVERRIDE;
|
|
|
| // Show either a context or normal click menu of given |menu_model_adapter|.
|
| // If |context_menu| is set, the displayed menu is a context menu and not
|
| @@ -256,7 +257,8 @@ class ASH_EXPORT LauncherView : public views::View,
|
| void ShowMenu(scoped_ptr<views::MenuModelAdapter> menu_model_adapter,
|
| views::View* source,
|
| const gfx::Point& click_point,
|
| - bool context_menu);
|
| + bool context_menu,
|
| + ui::MenuSourceType source_type);
|
|
|
| // Overridden from views::BoundsAnimatorObserver:
|
| virtual void OnBoundsAnimatorProgressed(
|
|
|