diff options
author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 00:03:19 +0000 |
---|---|---|
committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 00:03:19 +0000 |
commit | d86550c00f776377ab1ddf132b68c7092ddb0be0 (patch) | |
tree | d925060de767dc054e10e538bcb6e7fb8ac57509 /athena/resources | |
parent | c1ee9705485e86701789023da0ffc82f8169302c (diff) | |
download | chromium_src-d86550c00f776377ab1ddf132b68c7092ddb0be0.zip chromium_src-d86550c00f776377ab1ddf132b68c7092ddb0be0.tar.gz chromium_src-d86550c00f776377ab1ddf132b68c7092ddb0be0.tar.bz2 |
athena: Bundle a static background image with athena.
BUG=none
R=oshima@chromium.org
Review URL: https://codereview.chromium.org/443703002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287904 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'athena/resources')
-rw-r--r-- | athena/resources/athena_resources.grd | 16 | ||||
-rw-r--r-- | athena/resources/athena_resources.gyp | 19 | ||||
-rw-r--r-- | athena/resources/default_100_percent/background_wallpaper.png | bin | 0 -> 49615 bytes | |||
-rw-r--r-- | athena/resources/default_200_percent/background_wallpaper.png | bin | 0 -> 155705 bytes |
4 files changed, 35 insertions, 0 deletions
diff --git a/athena/resources/athena_resources.grd b/athena/resources/athena_resources.grd new file mode 100644 index 0000000..ee1665a --- /dev/null +++ b/athena/resources/athena_resources.grd @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<grit latest_public_release="0" current_release="1"> + <outputs> + <output filename="grit/athena_resources.h" type="rc_header" context="default_100_percent"> + <emit emit_type='prepend'></emit> + </output> + <output filename="athena_resources_100_percent.pak" type="data_package" context="default_100_percent" /> + <output filename="athena_resources_200_percent.pak" type="data_package" context="default_200_percent" /> + </outputs> + <release seq="1"> + <structures fallback_to_low_resolution="true"> + <!-- KEEP THESE IN ALPHABETICAL ORDER! --> + <structure type="chrome_scaled_image" name="IDR_ATHENA_BACKGROUND" file="background_wallpaper.png" /> + </structures> + </release> +</grit> diff --git a/athena/resources/athena_resources.gyp b/athena/resources/athena_resources.gyp index 4a16d31..88aa5a7 100644 --- a/athena/resources/athena_resources.gyp +++ b/athena/resources/athena_resources.gyp @@ -8,6 +8,23 @@ }, 'targets': [ { + 'target_name': 'athena_resources', + 'type': 'none', + 'variables': { + 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/athena/resources', + }, + 'actions': [ + { + 'action_name': 'athena_resources', + 'variables': { + 'grit_grd_file': 'athena_resources.grd', + }, + 'includes': [ '../../build/grit_action.gypi' ], + }, + ], + 'includes': [ '../../build/grit_target.gypi' ], + }, + { 'target_name': 'athena_pak', 'type': 'none', 'dependencies': [ @@ -17,6 +34,7 @@ '../../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings', '../../webkit/webkit_resources.gyp:webkit_resources', '../../webkit/webkit_resources.gyp:webkit_strings', + 'athena_resources', ], 'actions': [{ 'action_name': 'repack_athena_pack', @@ -24,6 +42,7 @@ 'pak_inputs': [ '<(PRODUCT_DIR)/extensions_shell_and_test.pak', '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/athena/resources/athena_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/strings/ui_chromeos_strings_en-US.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak', diff --git a/athena/resources/default_100_percent/background_wallpaper.png b/athena/resources/default_100_percent/background_wallpaper.png Binary files differnew file mode 100644 index 0000000..8af1734 --- /dev/null +++ b/athena/resources/default_100_percent/background_wallpaper.png diff --git a/athena/resources/default_200_percent/background_wallpaper.png b/athena/resources/default_200_percent/background_wallpaper.png Binary files differnew file mode 100644 index 0000000..1d088a4 --- /dev/null +++ b/athena/resources/default_200_percent/background_wallpaper.png |