diff options
| author | msw <msw@chromium.org> | 2016-03-03 16:55:30 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-04 00:56:52 +0000 |
| commit | 141c6b246d3cbb3212f76602ca40915c152af89a (patch) | |
| tree | 868d70ec80d26dbf91ccda25ef1d295947a04c3b /ash/shelf/app_list_shelf_item_delegate.cc | |
| parent | 243b2e8fb9cdd09cf9ec11aa2a68e26c76e00ee7 (diff) | |
| download | chromium_src-141c6b246d3cbb3212f76602ca40915c152af89a.zip chromium_src-141c6b246d3cbb3212f76602ca40915c152af89a.tar.gz chromium_src-141c6b246d3cbb3212f76602ca40915c152af89a.tar.bz2 | |
Simplify ash context menu creation.
Remove ash::ShelfItemDelegate::CreateContextMenu.
Use ash::ShellDelegate::CreateContextMenu instead.
(this is what all the impls do anyway...)
Don't pass the ShelfItemDelegate, look up as needed.
Only create |extension_items_| as needed.
Don't ask |extension_items_| for local enabled/checked state.
Remove non-cros logic from LauncherContextMenu.
Support null in GetAppIDForShelfID for app list button.
TODO: Refine menu model creation pattern to support mash.
BUG=557406
TEST=No behavior changes or regressions.
R=sky@chromium.org
Review URL: https://codereview.chromium.org/1762813002
Cr-Commit-Position: refs/heads/master@{#379158}
Diffstat (limited to 'ash/shelf/app_list_shelf_item_delegate.cc')
| -rw-r--r-- | ash/shelf/app_list_shelf_item_delegate.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/ash/shelf/app_list_shelf_item_delegate.cc b/ash/shelf/app_list_shelf_item_delegate.cc index f510732..6bac70b 100644 --- a/ash/shelf/app_list_shelf_item_delegate.cc +++ b/ash/shelf/app_list_shelf_item_delegate.cc @@ -6,7 +6,6 @@ #include "ash/shelf/shelf_model.h" #include "ash/shell.h" -#include "ash/shell_delegate.h" #include "grit/ash_strings.h" #include "ui/app_list/app_list_switches.h" #include "ui/base/l10n/l10n_util.h" @@ -46,13 +45,6 @@ base::string16 AppListShelfItemDelegate::GetTitle() { return l10n_util::GetStringUTF16(title_id); } -ui::MenuModel* AppListShelfItemDelegate::CreateContextMenu( - aura::Window* root_window) { - return Shell::GetInstance()->delegate()->CreateContextMenu(root_window, - NULL, - NULL); -} - ShelfMenuModel* AppListShelfItemDelegate::CreateApplicationMenu( int event_flags) { // AppList does not show an application menu. |