summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-11 01:10:45 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-11 01:10:45 +0000
commitb4037d13ad107e6fc72e1149ed4f760e08aedd9a (patch)
tree370e5a60e694bab5d7e6dc04010c5c2a966fd6d0 /chrome/app
parente896a4d2af4d4c15aeeeb66fb2b18950f777f103 (diff)
downloadchromium_src-b4037d13ad107e6fc72e1149ed4f760e08aedd9a.zip
chromium_src-b4037d13ad107e6fc72e1149ed4f760e08aedd9a.tar.gz
chromium_src-b4037d13ad107e6fc72e1149ed4f760e08aedd9a.tar.bz2
Lands http://codereview.chromium.org/379007 for Dave:
Fixes leak in BackingStore as shown by valgrind. XFree doesn't free the data of the image, where as XDestroyImage does. BUG=none TEST=none Review URL: http://codereview.chromium.org/391008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31633 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/theme/filebrowse_back.pngbin0 -> 482 bytes
-rw-r--r--chrome/app/theme/filebrowse_forward.pngbin0 -> 465 bytes
-rw-r--r--chrome/app/theme/icon_app.pngbin0 -> 236 bytes
-rw-r--r--chrome/app/theme/icon_file.pngbin0 -> 274 bytes
-rw-r--r--chrome/app/theme/icon_folder.pngbin0 -> 263 bytes
-rw-r--r--chrome/app/theme/icon_media.pngbin0 -> 301 bytes
-rw-r--r--chrome/app/theme/icon_photo.pngbin0 -> 335 bytes
-rw-r--r--chrome/app/theme/icon_webpage.pngbin0 -> 526 bytes
-rw-r--r--chrome/app/theme/theme_resources.grd10
9 files changed, 9 insertions, 1 deletions
diff --git a/chrome/app/theme/filebrowse_back.png b/chrome/app/theme/filebrowse_back.png
new file mode 100644
index 0000000..9fd71bd
--- /dev/null
+++ b/chrome/app/theme/filebrowse_back.png
Binary files differ
diff --git a/chrome/app/theme/filebrowse_forward.png b/chrome/app/theme/filebrowse_forward.png
new file mode 100644
index 0000000..1476ae3
--- /dev/null
+++ b/chrome/app/theme/filebrowse_forward.png
Binary files differ
diff --git a/chrome/app/theme/icon_app.png b/chrome/app/theme/icon_app.png
new file mode 100644
index 0000000..e6e395b
--- /dev/null
+++ b/chrome/app/theme/icon_app.png
Binary files differ
diff --git a/chrome/app/theme/icon_file.png b/chrome/app/theme/icon_file.png
new file mode 100644
index 0000000..440aa4b
--- /dev/null
+++ b/chrome/app/theme/icon_file.png
Binary files differ
diff --git a/chrome/app/theme/icon_folder.png b/chrome/app/theme/icon_folder.png
new file mode 100644
index 0000000..33a017c
--- /dev/null
+++ b/chrome/app/theme/icon_folder.png
Binary files differ
diff --git a/chrome/app/theme/icon_media.png b/chrome/app/theme/icon_media.png
new file mode 100644
index 0000000..c489b2e
--- /dev/null
+++ b/chrome/app/theme/icon_media.png
Binary files differ
diff --git a/chrome/app/theme/icon_photo.png b/chrome/app/theme/icon_photo.png
new file mode 100644
index 0000000..e263c55
--- /dev/null
+++ b/chrome/app/theme/icon_photo.png
Binary files differ
diff --git a/chrome/app/theme/icon_webpage.png b/chrome/app/theme/icon_webpage.png
new file mode 100644
index 0000000..90f9fe9
--- /dev/null
+++ b/chrome/app/theme/icon_webpage.png
Binary files differ
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index a3ce0e5..f76f977 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -399,7 +399,15 @@
<include name="IDR_STATUSBAR_WIFI_UP3P" file="statusbar_wifi_up3p.png" type="BINDATA" />
<include name="IDR_STATUSBAR_WARNING" file="statusbar_wifi_warning.png" type="BINDATA" />
<include name="IDR_STATUSBAR_WIRED" file="statusbar_wired.png" type="BINDATA" />
- </if>
+ <include name="IDR_FILEBROWSER_BACK" file="filebrowse_back.png" type="BINDATA" />
+ <include name="IDR_FILEBROWSER_FWD" file="filebrowse_forward.png" type="BINDATA" />
+ <include name="IDR_ICON_APP" file="icon_app.png" type="BINDATA" />
+ <include name="IDR_ICON_FILE" file="icon_file.png" type="BINDATA" />
+ <include name="IDR_ICON_FOLDER" file="icon_folder.png" type="BINDATA" />
+ <include name="IDR_ICON_MEDIA" file="icon_media.png" type="BINDATA" />
+ <include name="IDR_ICON_PHOTO" file="icon_photo.png" type="BINDATA" />
+ <include name="IDR_ICON_WEBPAGE" file="icon_webpage.png" type="BINDATA" />
+ </if>
<if expr="(pp_ifdef('chromeos') or pp_ifdef('toolkit_views')) and pp_ifdef('_google_chrome')">
<include name="IDR_MAIN_MENU_BUTTON" file="google_chrome/button_menu.png" type="BINDATA" />