summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_tab.cc
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-05 21:30:07 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-05 21:30:07 +0000
commit0794db6b6f44a76f45bc5b81ca5503249074af8f (patch)
tree12350d54802d2603692bf19132f5f4d9a784b0cb /chrome_frame/chrome_tab.cc
parentc944b32817f3c096c2ab172df2a685b408b12492 (diff)
downloadchromium_src-0794db6b6f44a76f45bc5b81ca5503249074af8f.zip
chromium_src-0794db6b6f44a76f45bc5b81ca5503249074af8f.tar.gz
chromium_src-0794db6b6f44a76f45bc5b81ca5503249074af8f.tar.bz2
Fix a chrome frame crash reported on the crash server. The crash occurs in the call to the UrlMkSetSessionOption API to refresh
the user agent from the registry. This is not needed anymore as we set the user agent in the outgoing http requests anyway. This fixes bug http://code.google.com/p/chromium/issues/detail?id=43340 Bug=43340 Review URL: http://codereview.chromium.org/1968004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46498 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_tab.cc')
-rw-r--r--chrome_frame/chrome_tab.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc
index 08e8a84..a00f814f 100644
--- a/chrome_frame/chrome_tab.cc
+++ b/chrome_frame/chrome_tab.cc
@@ -338,11 +338,7 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) {
if (redir_ptr) {
return redir_ptr(rclsid, riid, ppv);
} else {
- if (g_patch_helper.InitializeAndPatchProtocolsIfNeeded()) {
- // We should only get here once.
- UrlMkSetSessionOption(URLMON_OPTION_USERAGENT_REFRESH, NULL, 0, 0);
- }
-
+ g_patch_helper.InitializeAndPatchProtocolsIfNeeded();
return _AtlModule.DllGetClassObject(rclsid, riid, ppv);
}
}