summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorrahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-19 18:04:51 +0000
committerrahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-19 18:04:51 +0000
commit4880adb3346faa91feea9d8ecfecc4ef499bf7fc (patch)
tree8b8e1247c6b3d825727cf567fc1883a1a8036064 /chrome/app
parent5e30856836aa02569377f43f6f62af7badb1cee7 (diff)
downloadchromium_src-4880adb3346faa91feea9d8ecfecc4ef499bf7fc.zip
chromium_src-4880adb3346faa91feea9d8ecfecc4ef499bf7fc.tar.gz
chromium_src-4880adb3346faa91feea9d8ecfecc4ef499bf7fc.tar.bz2
Refactor localized strings used in installer for Chromium/Google Chrome separation (see other change out for review - chromium_1).
- Rename resources files as util_strings.* as they will be used by classes in util project. - Instead of directly accessing resource, chrome.dll and setup.exe will get the resource from helper class in util project. Remove references to header file from projects. - The resources still need be bundled in the binary so directly include util_strings.rc in resource file. - Add another string "Google Inc" in resource file to use as Publisher name. - Remove uninstall URL from resource file. This URL is not going to be localized, we are manually appending language parameter to it. BUG=1296800 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/chrome_dll.rc1
-rw-r--r--chrome/app/chrome_dll.vcproj12
2 files changed, 3 insertions, 10 deletions
diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc
index fd6cd47..4d25159 100644
--- a/chrome/app/chrome_dll.rc
+++ b/chrome/app/chrome_dll.rc
@@ -202,6 +202,7 @@ END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
+#include "installer_util_strings.rc"
#ifndef APSTUDIO_INVOKED
diff --git a/chrome/app/chrome_dll.vcproj b/chrome/app/chrome_dll.vcproj
index f525a6e..1ce83f9 100644
--- a/chrome/app/chrome_dll.vcproj
+++ b/chrome/app/chrome_dll.vcproj
@@ -21,7 +21,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="2"
- InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\chrome_dll.vsprops;..\installer\util\prebuild\util_prebuild.vsprops"
+ InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\chrome_dll.vsprops;..\installer\util\using_util.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -87,7 +87,7 @@
<Configuration
Name="Release|Win32"
ConfigurationType="2"
- InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\chrome_dll.vsprops;..\installer\util\prebuild\util_prebuild.vsprops"
+ InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\chrome_dll.vsprops;..\installer\util\using_util.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -218,14 +218,6 @@
>
</File>
<File
- RelativePath="$(IntDir)\..\util_prebuild\setup_strings.h"
- >
- </File>
- <File
- RelativePath="$(IntDir)\..\util_prebuild\setup_strings.rc"
- >
- </File>
- <File
RelativePath="..\..\webkit\glue\resources\vertical_text.cur"
>
</File>