summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-20 00:52:40 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-20 00:52:40 +0000
commit3b6027f7fb3aa49255ea34ef6828eb9c92bf3277 (patch)
tree72381fc42881d60d26c5c7190875c9607480d674 /chrome_frame
parent89f149288692a81558b15f711a468a79f458f4f8 (diff)
downloadchromium_src-3b6027f7fb3aa49255ea34ef6828eb9c92bf3277.zip
chromium_src-3b6027f7fb3aa49255ea34ef6828eb9c92bf3277.tar.gz
chromium_src-3b6027f7fb3aa49255ea34ef6828eb9c92bf3277.tar.bz2
Enable the ChromeFrame IMoniker patch by default now.
Review URL: http://codereview.chromium.org/1650015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44991 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/bho.cc2
-rw-r--r--chrome_frame/test/test_with_web_server.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/bho.cc b/chrome_frame/bho.cc
index 2877179..5ea51125 100644
--- a/chrome_frame/bho.cc
+++ b/chrome_frame/bho.cc
@@ -316,7 +316,7 @@ bool PatchHelper::InitializeAndPatchProtocolsIfNeeded() {
ProtocolPatchMethod patch_method =
static_cast<ProtocolPatchMethod>(
- GetConfigInt(PATCH_METHOD_IBROWSER, kPatchProtocols));
+ GetConfigInt(PATCH_METHOD_MONIKER, kPatchProtocols));
if (patch_method == PATCH_METHOD_INET_PROTOCOL) {
ProtocolSinkWrap::PatchProtocolHandlers();
state_ = PATCH_PROTOCOL;
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index b5c9648..2248089 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -19,7 +19,7 @@ const int kChromeFrameLongNavigationTimeoutInSeconds = 10;
bool MonikerPatchEnabled() {
ProtocolPatchMethod patch_method =
static_cast<ProtocolPatchMethod>(
- GetConfigInt(PATCH_METHOD_IBROWSER, kPatchProtocols));
+ GetConfigInt(PATCH_METHOD_MONIKER, kPatchProtocols));
LOG_IF(ERROR, patch_method != PATCH_METHOD_MONIKER)
<< "Not running test. Moniker patch not enabled.";
return patch_method == PATCH_METHOD_MONIKER;