From bbdbe155d5ae70a7d65b39566d5d704b5e442e00 Mon Sep 17 00:00:00 2001 From: "arv@chromium.org" Date: Thu, 29 Apr 2010 21:07:28 +0000 Subject: Add shared images from bookmark manager to chrome://resources/images/ This fixes a bug where we would have missing images in the bookmark manager. BUG=42817 TEST=Open the bookmark manager. No icons should be missing. Review URL: http://codereview.chromium.org/1697017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45983 0039d316-1c4b-4281-b951-d872f2087c98 --- .../browser/resources/bookmark_manager/css/bmm.css | 10 +++--- .../images/bookmark_bar_folder_mac.png | Bin 1345 -> 0 bytes .../bookmark_manager/images/folder_closed.png | Bin 412 -> 0 bytes .../bookmark_manager/images/folder_closed_rtl.png | Bin 438 -> 0 bytes .../bookmark_manager/images/folder_open.png | Bin 466 -> 0 bytes .../bookmark_manager/images/folder_open_rtl.png | Bin 469 -> 0 bytes chrome/chrome_browser.gypi | 38 ++++++++++++++++----- 7 files changed, 34 insertions(+), 14 deletions(-) delete mode 100644 chrome/browser/resources/bookmark_manager/images/bookmark_bar_folder_mac.png delete mode 100644 chrome/browser/resources/bookmark_manager/images/folder_closed.png delete mode 100644 chrome/browser/resources/bookmark_manager/images/folder_closed_rtl.png delete mode 100644 chrome/browser/resources/bookmark_manager/images/folder_open.png delete mode 100644 chrome/browser/resources/bookmark_manager/images/folder_open_rtl.png diff --git a/chrome/browser/resources/bookmark_manager/css/bmm.css b/chrome/browser/resources/bookmark_manager/css/bmm.css index ca3b986..7b5a2ab 100644 --- a/chrome/browser/resources/bookmark_manager/css/bmm.css +++ b/chrome/browser/resources/bookmark_manager/css/bmm.css @@ -60,7 +60,7 @@ html[dir=rtl] list .label { } list > .folder > .label { - background-image: url("../images/folder_closed.png"); + background-image: url("chrome://resources/images/folder_closed.png"); } /* We need to ensure that even empty labels take up space */ @@ -118,19 +118,19 @@ list .url form { /* end editing */ html[dir=rtl] list > .folder > .label { - background-image: url("../images/folder_closed_rtl.png"); + background-image: url("chrome://resources/images/folder_closed_rtl.png"); } html[os=mac] list > .folder > .label { - background-image: url("../images/bookmark_bar_folder_mac.png"); + background-image: url("chrome://resources/images/bookmark_bar_folder_mac.png"); } html[os=mac] .tree-label { - background-image: url("../images/bookmark_bar_folder_mac.png"); + background-image: url("chrome://resources/images/bookmark_bar_folder_mac.png"); } html[os=mac] .tree-row[selected] > .tree-label { - background-image: url("../images/bookmark_bar_folder_mac.png"); + background-image: url("chrome://resources/images/bookmark_bar_folder_mac.png"); } .main { diff --git a/chrome/browser/resources/bookmark_manager/images/bookmark_bar_folder_mac.png b/chrome/browser/resources/bookmark_manager/images/bookmark_bar_folder_mac.png deleted file mode 100644 index ec5d21f..0000000 Binary files a/chrome/browser/resources/bookmark_manager/images/bookmark_bar_folder_mac.png and /dev/null differ diff --git a/chrome/browser/resources/bookmark_manager/images/folder_closed.png b/chrome/browser/resources/bookmark_manager/images/folder_closed.png deleted file mode 100644 index 746fab9..0000000 Binary files a/chrome/browser/resources/bookmark_manager/images/folder_closed.png and /dev/null differ diff --git a/chrome/browser/resources/bookmark_manager/images/folder_closed_rtl.png b/chrome/browser/resources/bookmark_manager/images/folder_closed_rtl.png deleted file mode 100644 index dbd0b0a..0000000 Binary files a/chrome/browser/resources/bookmark_manager/images/folder_closed_rtl.png and /dev/null differ diff --git a/chrome/browser/resources/bookmark_manager/images/folder_open.png b/chrome/browser/resources/bookmark_manager/images/folder_open.png deleted file mode 100644 index 3276810..0000000 Binary files a/chrome/browser/resources/bookmark_manager/images/folder_open.png and /dev/null differ diff --git a/chrome/browser/resources/bookmark_manager/images/folder_open_rtl.png b/chrome/browser/resources/bookmark_manager/images/folder_open_rtl.png deleted file mode 100644 index 9ba7069..0000000 Binary files a/chrome/browser/resources/bookmark_manager/images/folder_open_rtl.png and /dev/null differ diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 3a59ea4..0a797ea 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -14,6 +14,7 @@ 'chrome_strings', 'chrome_version_info', 'component_extensions', + 'domui_shared_resources', 'net_internals_resources', 'platform_locale_settings', 'sync_proto', @@ -3195,11 +3196,14 @@ ], }, { - 'target_name': 'component_extensions', + 'target_name': 'domui_shared_resources', 'type': 'none', - 'msvs_guid': '50B52703-525F-404C-BFE2-C46D3375D73E', - # TODO(aa): Once the msvs port supports it, change this to recursively + 'msvs_guid': '7BB23C84-71AA-4320-9EE1-9EBCDB04C964', + # TODO(arv): Once the msvs port supports it, change this to recursively # copy the entire directory instead of listing the files. + # TODO(arv): We also need to allow filters so we do not copy the test + # files. Tony said that another option would be to run a python script + # here instead. # http://code.google.com/p/gyp/issues/detail?id=143. 'copies': [ { @@ -3212,13 +3216,23 @@ ] }, { + 'destination': '<(PRODUCT_DIR)/resources/shared/images', + 'files': [ + '../app/resources/folder_closed.png', + '../app/resources/folder_closed_rtl.png', + '../app/resources/folder_open.png', + '../app/resources/folder_open_rtl.png', + 'app/theme/bookmark_bar_folder_mac.png', + ] + }, + { 'destination': '<(PRODUCT_DIR)/resources/shared/js', 'files': [ 'browser/resources/shared/js/cr_test.html', 'browser/resources/shared/js/cr.js', 'browser/resources/shared/js/i18ntemplate.js', 'browser/resources/shared/js/localstrings.js', - 'browser/resources/shared/js/util.js', + 'browser/resources/shared/js/util.js', ] }, { @@ -3249,6 +3263,16 @@ 'browser/resources/shared/js/cr/ui/tree.js', ] }, + ] + }, + { + 'target_name': 'component_extensions', + 'type': 'none', + 'msvs_guid': '50B52703-525F-404C-BFE2-C46D3375D73E', + # TODO(aa): Once the msvs port supports it, change this to recursively + # copy the entire directory instead of listing the files. + # http://code.google.com/p/gyp/issues/detail?id=143. + 'copies': [ { 'destination': '<(PRODUCT_DIR)/resources/bookmark_manager', 'files': [ @@ -3280,15 +3304,11 @@ { 'destination': '<(PRODUCT_DIR)/resources/bookmark_manager/images', 'files': [ - '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/folder_closed.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', + 'browser/resources/bookmark_manager/images/bookmarks_section_32.png', ] }, { -- cgit v1.1