diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-05 19:16:23 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-05 19:16:23 +0000 |
| commit | ea9ed97d074fa3ae84486f952eb66ea1e95ce37e (patch) | |
| tree | d4603d01863ded8450e4d3109bf56d406e2c1d1a /chrome/installer | |
| parent | 880b6f26f7cda4ddefbf2c269a2ec86dce71c2ff (diff) | |
| download | chromium_src-ea9ed97d074fa3ae84486f952eb66ea1e95ce37e.zip chromium_src-ea9ed97d074fa3ae84486f952eb66ea1e95ce37e.tar.gz chromium_src-ea9ed97d074fa3ae84486f952eb66ea1e95ce37e.tar.bz2 | |
Some Chrome Frame cleanup:
1) Rearrange the chrome_frame.gyp file to:
a) Split out most of CF into a static lib to make writing unit tests easier (not having to re-include source files).
b) Remove most of the un-needed xulrunner-sdk includes.
2) Move all OBJECT_ENTRY_AUTO macros to chrome_tab.cc since they don't work without extra work when residing in a lib.
3) Rename npchrome_tab.dll to npchrome_frame.dll.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/523040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35543 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/installer.gyp | 2 | ||||
| -rw-r--r-- | chrome/installer/util/util_constants.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp index f108a01..b28017d 100644 --- a/chrome/installer/installer.gyp +++ b/chrome/installer/installer.gyp @@ -266,7 +266,7 @@ 'conditions': [ ['chrome_frame_define==1', { 'dependencies': [ - '../../chrome_frame/chrome_frame.gyp:npchrome_tab', + '../../chrome_frame/chrome_frame.gyp:npchrome_frame', ], }], # TODO(mark): <(branding_dir) should be defined by the diff --git a/chrome/installer/util/util_constants.cc b/chrome/installer/util/util_constants.cc index 64544c4..5505685 100644 --- a/chrome/installer/util/util_constants.cc +++ b/chrome/installer/util/util_constants.cc @@ -113,7 +113,7 @@ const wchar_t kChromeExe[] = L"chrome.exe"; const wchar_t kChromeOldExe[] = L"old_chrome.exe"; const wchar_t kChromeNewExe[] = L"new_chrome.exe"; const wchar_t kChromeDll[] = L"chrome.dll"; -const wchar_t kChromeFrameDll[] = L"npchrome_tab.dll"; +const wchar_t kChromeFrameDll[] = L"npchrome_frame.dll"; const wchar_t kSetupExe[] = L"setup.exe"; const wchar_t kInstallerDir[] = L"Installer"; |