diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 16:15:36 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 16:15:36 +0000 |
| commit | 134f026b351710de477deb964eb6726a778642f5 (patch) | |
| tree | 2d17063a54b6fecf1c4e9e8ca30c0b45fc9c0237 /chrome | |
| parent | 5824201bb57df84df3abf2bfc1f1ce8d2cf0c3f4 (diff) | |
| download | chromium_src-134f026b351710de477deb964eb6726a778642f5.zip chromium_src-134f026b351710de477deb964eb6726a778642f5.tar.gz chromium_src-134f026b351710de477deb964eb6726a778642f5.tar.bz2 | |
Revert r129947 as this breaks several bits of Chrome that call into the installer code.
We noticed this in the shortcut creation code.
BUG=119947
TEST=NONE
Review URL: http://codereview.chromium.org/9969160
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131995 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/chrome_dll.rc | 2 | ||||
| -rw-r--r-- | chrome/chrome_dll.gypi | 1 | ||||
| -rw-r--r-- | chrome/chrome_exe.gypi | 1 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 7 |
4 files changed, 11 insertions, 0 deletions
diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc index 879579a..7238647 100644 --- a/chrome/app/chrome_dll.rc +++ b/chrome/app/chrome_dll.rc @@ -246,6 +246,8 @@ END #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// +#include "installer_util_strings/installer_util_strings.rc" + #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 96bf378..649baee 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -60,6 +60,7 @@ # up actual Chromium functionality into this .dll. 'chrome_resources.gyp:chrome_resources', 'chrome_version_resources', + 'installer_util_strings', '../content/content.gyp:content_worker', '../crypto/crypto.gyp:crypto', '../printing/printing.gyp:printing', diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index feafe31..e638b2d 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -439,6 +439,7 @@ 'chrome_dll', 'chrome_version_resources', 'installer_util', + 'installer_util_strings', 'image_pre_reader', '../base/base.gyp:base', '../breakpad/breakpad.gyp:breakpad_handler', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 3e49994..3e3a31b 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -660,6 +660,7 @@ ], 'dependencies': [ 'chrome.gyp:chrome_version_resources', + 'chrome.gyp:installer_util_strings', '../sandbox/sandbox.gyp:sandbox', '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', '../third_party/isimpledom/isimpledom.gyp:isimpledom', @@ -2373,6 +2374,7 @@ ['OS=="win"', { 'dependencies': [ 'chrome_version_resources', + 'installer_util_strings', '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', '../third_party/isimpledom/isimpledom.gyp:isimpledom', ], @@ -3233,6 +3235,7 @@ ], 'dependencies': [ 'chrome_version_resources', + 'installer_util_strings', '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', '../sandbox/sandbox.gyp:sandbox', ], @@ -3481,6 +3484,7 @@ ], 'dependencies': [ 'chrome_version_resources', + 'installer_util_strings', '../sandbox/sandbox.gyp:sandbox', ], 'conditions': [ @@ -3593,6 +3597,7 @@ ['OS=="win"', { 'dependencies': [ 'chrome_version_resources', + 'installer_util_strings', '../sandbox/sandbox.gyp:sandbox', ], 'sources': [ @@ -3957,6 +3962,7 @@ ], 'dependencies': [ 'chrome_version_resources', + 'installer_util_strings', '../sandbox/sandbox.gyp:sandbox', ], 'conditions': [ @@ -4080,6 +4086,7 @@ ], 'dependencies': [ 'chrome_version_resources', + 'installer_util_strings', '../sandbox/sandbox.gyp:sandbox', ], 'conditions': [ |