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 /ui/resources | |
| 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 'ui/resources')
| -rw-r--r-- | ui/resources/aura/applist.png | bin | 0 -> 1181 bytes | |||
| -rw-r--r-- | ui/resources/aura/browser_instance.png | bin | 0 -> 1446 bytes | |||
| -rw-r--r-- | ui/resources/aura/chromium-48.png | bin | 0 -> 1790 bytes | |||
| -rw-r--r-- | ui/resources/aura/damask.png | bin | 0 -> 20400 bytes | |||
| -rw-r--r-- | ui/resources/aura/statusbar.png | bin | 0 -> 3680 bytes | |||
| -rw-r--r-- | ui/resources/ui_resources.grd | 8 |
6 files changed, 8 insertions, 0 deletions
diff --git a/ui/resources/aura/applist.png b/ui/resources/aura/applist.png Binary files differnew file mode 100644 index 0000000..e23f708 --- /dev/null +++ b/ui/resources/aura/applist.png diff --git a/ui/resources/aura/browser_instance.png b/ui/resources/aura/browser_instance.png Binary files differnew file mode 100644 index 0000000..d279362 --- /dev/null +++ b/ui/resources/aura/browser_instance.png diff --git a/ui/resources/aura/chromium-48.png b/ui/resources/aura/chromium-48.png Binary files differnew file mode 100644 index 0000000..9085a79 --- /dev/null +++ b/ui/resources/aura/chromium-48.png diff --git a/ui/resources/aura/damask.png b/ui/resources/aura/damask.png Binary files differnew file mode 100644 index 0000000..58f22ca5 --- /dev/null +++ b/ui/resources/aura/damask.png diff --git a/ui/resources/aura/statusbar.png b/ui/resources/aura/statusbar.png Binary files differnew file mode 100644 index 0000000..343c17b --- /dev/null +++ b/ui/resources/aura/statusbar.png diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index 15dfaac..d6d8b41 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -118,6 +118,14 @@ <include name="IDR_MENU_ARROW" file="menu_arrow.png" type="BINDATA" /> <include name="IDR_MENU_CHECK" file="menu_check.png" type="BINDATA" /> </if> + + <!-- Images only used by Aura. --> + <if expr="pp_ifdef('use_aura')"> + <include name="IDR_AURA_LAUNCHER_ICON_CHROME" file="aura/chromium-48.png" type="BINDATA" /> + <include name="IDR_AURA_LAUNCHER_ICON_APPLIST" file="aura/applist.png" type="BINDATA" /> + <include name="IDR_AURA_STATUS_MOCK" file="aura/statusbar.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPER" file="aura/damask.png" type="BINDATA" /> + </if> </includes> </release> </grit> |
