summaryrefslogtreecommitdiffstats
path: root/chrome/installer
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-24 01:26:40 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-24 01:26:40 +0000
commit3573b43d8178c8c9b4c4efc937e3ca3342bdae11 (patch)
tree7c7305894803d864aa33d4a13dd3289cc360aaf5 /chrome/installer
parent270d97d0e083743053613360b6342d6a9d199071 (diff)
downloadchromium_src-3573b43d8178c8c9b4c4efc937e3ca3342bdae11.zip
chromium_src-3573b43d8178c8c9b4c4efc937e3ca3342bdae11.tar.gz
chromium_src-3573b43d8178c8c9b4c4efc937e3ca3342bdae11.tar.bz2
Move the bookmark manager into resources.pak.
This allows for the bookmark manager to work after upgrading in the background on Linux. BUG=42770 TEST=Bookmark manager still works Review URL: http://codereview.chromium.org/2814009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50683 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
-rw-r--r--chrome/installer/mini_installer/chrome.release5
-rw-r--r--chrome/installer/mini_installer/chrome_frame.release2
2 files changed, 1 insertions, 6 deletions
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index 7ceeeee..cf5f782 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -38,11 +38,6 @@ icudt42.dll: %(VersionDir)s\
gears.dll: %(VersionDir)s\
resources.pak: %(VersionDir)s\
locales\*.dll: %(VersionDir)s\Locales
-Resources\bookmark_manager\*.*: %(VersionDir)s\Resources\bookmark_manager
-Resources\bookmark_manager\css\*.*: %(VersionDir)s\Resources\bookmark_manager\css
-Resources\bookmark_manager\images\*.*: %(VersionDir)s\Resources\bookmark_manager\images
-Resources\bookmark_manager\js\*.*: %(VersionDir)s\Resources\bookmark_manager\js
-Resources\bookmark_manager\js\bmm\*.*: %(VersionDir)s\Resources\bookmark_manager\js\bmm
Resources\shared\css\*.*: %(VersionDir)s\Resources\shared\css
Resources\shared\images\*.*: %(VersionDir)s\Resources\shared\images
Resources\shared\js\*.*: %(VersionDir)s\Resources\shared\js
diff --git a/chrome/installer/mini_installer/chrome_frame.release b/chrome/installer/mini_installer/chrome_frame.release
index 1e5fce3..cfddf3e 100644
--- a/chrome/installer/mini_installer/chrome_frame.release
+++ b/chrome/installer/mini_installer/chrome_frame.release
@@ -36,7 +36,7 @@ nacl64.exe: %(VersionDir)s\
nacl64.dll: %(VersionDir)s\
icudt42.dll: %(VersionDir)s\
gears.dll: %(VersionDir)s\
-Themes\default.dll: %(VersionDir)s\Themes
+resources.pak: %(VersionDir)s\
locales\*.dll: %(VersionDir)s\Locales
Resources\Inspector\*.*: %(VersionDir)s\Resources\Inspector
Resources\Inspector\Images\*.*: %(VersionDir)s\Resources\Inspector\Images