diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 20:40:56 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 20:40:56 +0000 |
| commit | 9628e0afd55f6f621ad6715fd3c394e4d435163b (patch) | |
| tree | ac34b3fd7c82c17e70e7ae4ad139784e60b460b6 /ash/shell | |
| parent | 0c1fb48686d1cf0dd91d6f121db2e4c6446c9336 (diff) | |
| download | chromium_src-9628e0afd55f6f621ad6715fd3c394e4d435163b.zip chromium_src-9628e0afd55f6f621ad6715fd3c394e4d435163b.tar.gz chromium_src-9628e0afd55f6f621ad6715fd3c394e4d435163b.tar.bz2 | |
Implements new semantics for launcher context menu. Gone are the three
items, and instead they're repalced with a single item. The behavior of
the item changes depending upon whether in maximized mode or not. I've
put the core functionality into ash so that ash_shell now gets the
context menu too.
BUG=120947
TEST=see bug, also covered by tests.
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10069023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132048 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
| -rw-r--r-- | ash/shell/launcher_delegate_impl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/shell/launcher_delegate_impl.cc b/ash/shell/launcher_delegate_impl.cc index 9d7fe27..ddf4add 100644 --- a/ash/shell/launcher_delegate_impl.cc +++ b/ash/shell/launcher_delegate_impl.cc @@ -4,6 +4,7 @@ #include "ash/shell/launcher_delegate_impl.h" +#include "ash/launcher/launcher_context_menu.h" #include "ash/shell/toplevel_window.h" #include "ash/shell/window_watcher.h" #include "ash/wm/window_util.h" @@ -52,7 +53,7 @@ ui::MenuModel* LauncherDelegateImpl::CreateContextMenu( } ui::MenuModel* LauncherDelegateImpl::CreateContextMenuForLauncher() { - return NULL; + return new LauncherContextMenu; } ash::LauncherID LauncherDelegateImpl::GetIDByWindow(aura::Window* window) { |