summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorarv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 00:08:33 +0000
committerarv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 00:08:33 +0000
commit4d2ef9dfc66337ddfa1dffe263434246744771c1 (patch)
tree1d145e7259ee663d7e094b1b34d3a60da07d4ab8 /chrome
parent543b130ee81bc8d263d27639726ffcc68c7f74ea (diff)
downloadchromium_src-4d2ef9dfc66337ddfa1dffe263434246744771c1.zip
chromium_src-4d2ef9dfc66337ddfa1dffe263434246744771c1.tar.gz
chromium_src-4d2ef9dfc66337ddfa1dffe263434246744771c1.tar.bz2
Fix issue where default_favicon.png did not get copied.
I also sorted the files alphabetically. BUG=None TEST=None Review URL: http://codereview.chromium.org/1145002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42037 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rwxr-xr-xchrome/chrome_browser.gypi21
1 files changed, 11 insertions, 10 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 7643ec1..730914a 100755
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2362,7 +2362,7 @@
}],
['chromeos==0', {
'sources/': [
- ['exclude', '^browser/chromeos'],
+ ['exclude', '^browser/chromeos'],
],
}],
['OS=="linux"', {
@@ -3052,15 +3052,15 @@
{
'destination': '<(PRODUCT_DIR)/resources/bookmark_manager/js/cr/ui',
'files': [
- 'browser/resources/bookmark_manager/js/cr/ui/menuitem.js',
'browser/resources/bookmark_manager/js/cr/ui/command.js',
- 'browser/resources/bookmark_manager/js/cr/ui/menubutton.js',
+ 'browser/resources/bookmark_manager/js/cr/ui/contextmenuhandler.js',
'browser/resources/bookmark_manager/js/cr/ui/list.js',
- 'browser/resources/bookmark_manager/js/cr/ui/tree.js',
+ 'browser/resources/bookmark_manager/js/cr/ui/listitem.js',
'browser/resources/bookmark_manager/js/cr/ui/listselectionmodel.js',
'browser/resources/bookmark_manager/js/cr/ui/menu.js',
- 'browser/resources/bookmark_manager/js/cr/ui/listitem.js',
- 'browser/resources/bookmark_manager/js/cr/ui/contextmenuhandler.js',
+ 'browser/resources/bookmark_manager/js/cr/ui/menubutton.js',
+ 'browser/resources/bookmark_manager/js/cr/ui/menuitem.js',
+ 'browser/resources/bookmark_manager/js/cr/ui/tree.js',
]
},
{
@@ -3074,15 +3074,16 @@
{
'destination': '<(PRODUCT_DIR)/resources/bookmark_manager/images',
'files': [
- 'browser/resources/bookmark_manager/images/folder_open_rtl.png',
- 'browser/resources/bookmark_manager/images/folder_open.png',
- 'browser/resources/bookmark_manager/images/bookmark_manager_recent.png',
'browser/resources/bookmark_manager/images/bookmark_bar_folder_mac.png',
+ 'browser/resources/bookmark_manager/images/bookmark_manager_recent.png',
+ 'browser/resources/bookmark_manager/images/bookmark_manager_search.png',
'browser/resources/bookmark_manager/images/bookmarks_favicon.png',
'browser/resources/bookmark_manager/images/bookmarks_section.png',
+ 'browser/resources/bookmark_manager/images/default_favicon.png',
'browser/resources/bookmark_manager/images/folder_closed.png',
- 'browser/resources/bookmark_manager/images/bookmark_manager_search.png',
'browser/resources/bookmark_manager/images/folder_closed_rtl.png',
+ 'browser/resources/bookmark_manager/images/folder_open.png',
+ 'browser/resources/bookmark_manager/images/folder_open_rtl.png',
]
},
]