diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-16 16:37:30 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-16 16:37:30 +0000 |
| commit | 8dd791d08b42a61976626b5a8e2a58a4e66efea2 (patch) | |
| tree | e32f42b471f186d7b673c2ec2183a413e50656e9 /build | |
| parent | 527316365ae362d83de28af7c509757b503e38af (diff) | |
| download | chromium_src-8dd791d08b42a61976626b5a8e2a58a4e66efea2.zip chromium_src-8dd791d08b42a61976626b5a8e2a58a4e66efea2.tar.gz chromium_src-8dd791d08b42a61976626b5a8e2a58a4e66efea2.tar.bz2 | |
Adds some features to the shell:
- desktop background
- stub launcher
- clicking the background opens test windows
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7903018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 9 | ||||
| -rw-r--r-- | build/common.gypi | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/build/all.gyp b/build/all.gyp index 04b87af..e3cfa9c 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -90,7 +90,7 @@ }], ], }], - ['use_wayland == 1', { + ['use_wayland==1', { 'dependencies': [ '../ui/wayland/wayland.gyp:*', ], @@ -121,7 +121,6 @@ '../third_party/bspatch/bspatch.gyp:*', '../third_party/gles2_book/gles2_book.gyp:*', '../tools/memory_watcher/memory_watcher.gyp:*', - '../ui/aura/aura.gyp:*', ], }, { 'dependencies': [ @@ -133,6 +132,12 @@ '../views/views.gyp:*', ], }], + ['use_aura==1', { + 'dependencies': [ + '../ui/aura/aura.gyp:*', + '../ui/aura_shell/aura_shell.gyp:*', + ], + }], ['remoting==1', { 'dependencies': [ '../remoting/remoting.gyp:*', diff --git a/build/common.gypi b/build/common.gypi index a106db1..f5b5bc1 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -662,6 +662,9 @@ ['use_only_pure_views==1', { 'grit_defines': ['-D', 'use_only_pure_views'], }], + ['use_aura==1', { + 'grit_defines': ['-D', 'use_aura'], + }], ['touchui==1', { 'grit_defines': ['-D', 'touchui'], }], |