diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-17 17:53:48 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-17 17:53:48 +0000 |
| commit | 79206cd0e7123e56006b165c824acdb0b3559b63 (patch) | |
| tree | 9396cb4c35b46982e7703046a7cc3c6d0c069ce9 /chrome_frame/chrome_launcher.cc | |
| parent | 2ac837a92d049c5bf89b77888ca2c80be0f260c2 (diff) | |
| download | chromium_src-79206cd0e7123e56006b165c824acdb0b3559b63.zip chromium_src-79206cd0e7123e56006b165c824acdb0b3559b63.tar.gz chromium_src-79206cd0e7123e56006b165c824acdb0b3559b63.tar.bz2 | |
Make use of the new version flag in Chrome to load the correct chrome.dll version.
Also fix a memory leak in the Chrome Frame automation code.
BUG=61609
TEST=Chrome.exe always loads the specified chrome.dll when run by Chrome Frame.
Review URL: http://codereview.chromium.org/5090001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66462 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_launcher.cc')
| -rw-r--r-- | chrome_frame/chrome_launcher.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome_frame/chrome_launcher.cc b/chrome_frame/chrome_launcher.cc index a8ff329..af28992 100644 --- a/chrome_frame/chrome_launcher.cc +++ b/chrome_frame/chrome_launcher.cc @@ -20,6 +20,7 @@ namespace { const wchar_t* kAllowedSwitches[] = { L"automation-channel", L"chrome-frame", + L"chrome-version", L"disable-renderer-accessibility", L"enable-experimental-extension-apis", L"force-renderer-accessibility", |