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

Unified Diff: ash/launcher/launcher_view.h

Issue 16979002: Add ContextMenuSourceType to views::ContextMenuController::ShowContextMenuForView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch Created 7 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/launcher/launcher_unittest.cc ('k') | ash/launcher/launcher_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
« no previous file with comments | « ash/launcher/launcher_unittest.cc ('k') | ash/launcher/launcher_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698