summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-16 21:42:00 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-16 21:42:00 +0000
commitc806036c626e061b0768c234566d384e97644a56 (patch)
tree4a8e16bee4accdfafc81c1353a2f55b353422eea /chrome
parent67a46b7f6da205b7a1e772b7383bb20bab8ca611 (diff)
downloadchromium_src-c806036c626e061b0768c234566d384e97644a56.zip
chromium_src-c806036c626e061b0768c234566d384e97644a56.tar.gz
chromium_src-c806036c626e061b0768c234566d384e97644a56.tar.bz2
Adds a couple of images.
BUG=none TEST=none Review URL: http://codereview.chromium.org/126226 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18541 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rwxr-xr-xchrome/app/theme/new_browser_window.pngbin0 -> 4583 bytes
-rwxr-xr-xchrome/app/theme/tab_overview.pngbin0 -> 4404 bytes
-rw-r--r--chrome/app/theme/theme_resources.grd5
-rw-r--r--chrome/chrome.gyp5
4 files changed, 10 insertions, 0 deletions
diff --git a/chrome/app/theme/new_browser_window.png b/chrome/app/theme/new_browser_window.png
new file mode 100755
index 0000000..6ed666b
--- /dev/null
+++ b/chrome/app/theme/new_browser_window.png
Binary files differ
diff --git a/chrome/app/theme/tab_overview.png b/chrome/app/theme/tab_overview.png
new file mode 100755
index 0000000..a6afc03
--- /dev/null
+++ b/chrome/app/theme/tab_overview.png
Binary files differ
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index e31dcd6..e970f46 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -299,6 +299,11 @@
<include name="IDR_WIZARD_ICON_RTL" file="chromium/wizard_icon_rtl.png" type="BINDATA" />
<include name="IDR_PRODUCT_ICON_32" file="chromium/chromium_icon_32.png" type="BINDATA" />
</if>
+
+ <if expr="pp_ifdef('linux2')">
+ <include name="IDR_NEW_BROWSER_WINDOW_ICON" file="new_browser_window.png" type="BINDATA" />
+ <include name="IDR_TAB_OVERVIEW_BUTTON_ICON" file="tab_overview.png" type="BINDATA" />
+ </if>
</includes>
</release>
</grit>
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index c5184bb..ef48b56 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -234,6 +234,11 @@
],
}]
],
+ 'conditions': [
+ ['linux2==1', {
+ 'action': ['-D', 'linux2'],
+ }],
+ ],
'message': 'Generating resources from <(input_path)',
},
],