| Index: ash/launcher/launcher_view.h
|
| diff --git a/ash/launcher/launcher_view.h b/ash/launcher/launcher_view.h
|
| index a431d128a1f99660e2dce7ead3495f1e0cf71abb..500e90998590b5da5953c23550a67820bb6f367f 100644
|
| --- a/ash/launcher/launcher_view.h
|
| +++ b/ash/launcher/launcher_view.h
|
| @@ -246,8 +246,10 @@ class ASH_EXPORT LauncherView : public views::View,
|
| int event_flags);
|
|
|
| // Overridden from views::ContextMenuController:
|
| - virtual void ShowContextMenuForView(views::View* source,
|
| - const gfx::Point& point) OVERRIDE;
|
| + virtual void ShowContextMenuForView(
|
| + views::View* source,
|
| + const gfx::Point& point,
|
| + ui::ContextMenuSourceType 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 +258,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::ContextMenuSourceType source_type);
|
|
|
| // Overridden from views::BoundsAnimatorObserver:
|
| virtual void OnBoundsAnimatorProgressed(
|
|
|