summaryrefslogtreecommitdiffstats
path: root/ash/ash.gyp
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-12 20:40:56 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-12 20:40:56 +0000
commit9628e0afd55f6f621ad6715fd3c394e4d435163b (patch)
treeac34b3fd7c82c17e70e7ae4ad139784e60b460b6 /ash/ash.gyp
parent0c1fb48686d1cf0dd91d6f121db2e4c6446c9336 (diff)
downloadchromium_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/ash.gyp')
-rw-r--r--ash/ash.gyp3
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp
index ad6445b..c88621a 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -88,6 +88,8 @@
'launcher/launcher.h',
'launcher/launcher_button.cc',
'launcher/launcher_button.h',
+ 'launcher/launcher_context_menu.cc',
+ 'launcher/launcher_context_menu.h',
'launcher/launcher_delegate.h',
'launcher/launcher_model.cc',
'launcher/launcher_model.h',
@@ -335,6 +337,7 @@
'drag_drop/drag_drop_controller_unittest.cc',
'focus_cycler_unittest.cc',
'ime/input_method_event_filter_unittest.cc',
+ 'launcher/launcher_context_menu_unittest.cc',
'launcher/launcher_model_unittest.cc',
'launcher/launcher_unittest.cc',
'monitor/multi_monitor_manager_unittest.cc',