diff options
| author | pkotwicz <pkotwicz@chromium.org> | 2014-09-01 18:47:08 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-02 01:53:15 +0000 |
| commit | 73bd924d3996da6e1992b095e3eca90e29c0a10d (patch) | |
| tree | 5a553f7dc309a9a75b81d8316aa32ea673603477 /athena/athena.gyp | |
| parent | 04ecdba1348049653e33b351f4e7649058b30959 (diff) | |
| download | chromium_src-73bd924d3996da6e1992b095e3eca90e29c0a10d.zip chromium_src-73bd924d3996da6e1992b095e3eca90e29c0a10d.tar.gz chromium_src-73bd924d3996da6e1992b095e3eca90e29c0a10d.tar.bz2 | |
[Athena] Add status icons and system time to the desktop background
BUG=404156
TEST=Manual, see bug
TBR=sadrul, oshima (TBRing because of DEPS file modifications)
Review URL: https://codereview.chromium.org/483363003
Cr-Commit-Position: refs/heads/master@{#292895}
Diffstat (limited to 'athena/athena.gyp')
| -rw-r--r-- | athena/athena.gyp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/athena/athena.gyp b/athena/athena.gyp index dee4e51..1b634f0 100644 --- a/athena/athena.gyp +++ b/athena/athena.gyp @@ -11,7 +11,11 @@ 'target_name': 'athena_lib', 'type': '<(component)', 'dependencies': [ + # status_icon_container_view.cc depends on this. Remove this once there + # are athena specific assets. + '../ash/ash_resources.gyp:ash_resources', '../base/base.gyp:test_support_base', + '../chromeos/chromeos.gyp:power_manager_proto', '../extensions/shell/app_shell.gyp:app_shell_version_header', '../ipc/ipc.gyp:ipc', '../skia/skia.gyp:skia', @@ -71,19 +75,25 @@ 'input/input_manager_impl.cc', 'input/public/accelerator_manager.h', 'input/public/input_manager.h', - 'screen/background_controller.cc', - 'screen/background_controller.h', 'screen/public/screen_manager.h', 'screen/screen_accelerator_handler.cc', 'screen/screen_accelerator_handler.h', 'screen/screen_manager_impl.cc', + 'system/background_controller.cc', + 'system/background_controller.h', 'system/device_socket_listener.cc', 'system/device_socket_listener.h', + 'system/network_selector.cc', + 'system/network_selector.h', 'system/orientation_controller.cc', 'system/orientation_controller.h', 'system/power_button_controller.cc', 'system/power_button_controller.h', - 'system/public/system_ui.h', + 'system/status_icon_container_view.cc', + 'system/status_icon_container_view.h', + 'system/time_view.cc', + 'system/time_view.h', + 'system/public/system_ui.h', 'system/system_ui_impl.cc', 'wm/bezel_controller.cc', 'wm/bezel_controller.h', |