diff options
| author | msw <msw@chromium.org> | 2016-03-21 11:08:26 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-21 18:09:56 +0000 |
| commit | bc1cee6f1db69579e72287bdd1aca442ca904ec2 (patch) | |
| tree | c3b988d0b6fbf7acc0b9098ac371a1b0ce4f8919 /ash/mus/shell_delegate_mus.cc | |
| parent | ee50736c96ca97939d5b99543f3e0b297fd88029 (diff) | |
| download | chromium_src-bc1cee6f1db69579e72287bdd1aca442ca904ec2.zip chromium_src-bc1cee6f1db69579e72287bdd1aca442ca904ec2.tar.gz chromium_src-bc1cee6f1db69579e72287bdd1aca442ca904ec2.tar.bz2 | |
Add simple mash context menu support.
Add ash/mus/context_menu_mus.* for mash context menus.
(populates local ash items like ash_shell_with_content)
Tangential ShelfView refactoring (can be split).
BUG=557406
TEST="chrome --mash" context menus appear.
R=sky@chromium.org
Review URL: https://codereview.chromium.org/1760743002
Cr-Commit-Position: refs/heads/master@{#382326}
Diffstat (limited to 'ash/mus/shell_delegate_mus.cc')
| -rw-r--r-- | ash/mus/shell_delegate_mus.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/mus/shell_delegate_mus.cc b/ash/mus/shell_delegate_mus.cc index 7f627e1..3ce7579 100644 --- a/ash/mus/shell_delegate_mus.cc +++ b/ash/mus/shell_delegate_mus.cc @@ -8,6 +8,7 @@ #include "ash/default_user_wallpaper_delegate.h" #include "ash/gpu_support_stub.h" #include "ash/media_delegate.h" +#include "ash/mus/context_menu_mus.h" #include "ash/mus/shelf_delegate_mus.h" #include "ash/session/session_state_delegate.h" #include "ash/system/tray/default_system_tray_delegate.h" @@ -95,6 +96,7 @@ class MediaDelegateStub : public MediaDelegate { } // namespace ShellDelegateMus::ShellDelegateMus() {} + ShellDelegateMus::~ShellDelegateMus() {} bool ShellDelegateMus::IsFirstRunAfterBoot() const { @@ -199,8 +201,7 @@ MediaDelegate* ShellDelegateMus::CreateMediaDelegate() { ui::MenuModel* ShellDelegateMus::CreateContextMenu(ash::Shelf* shelf, const ShelfItem* item) { - NOTIMPLEMENTED(); - return nullptr; + return new ContextMenuMus(shelf); } GPUSupport* ShellDelegateMus::CreateGPUSupport() { |