summaryrefslogtreecommitdiffstats
path: root/chrome_frame/utils.cc
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-20 23:28:52 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-20 23:28:52 +0000
commit830005dd23868ae6a4fe75dab08c08ee04831ca2 (patch)
treedb98eda277bb2a78e00b4424116f22e76f624d40 /chrome_frame/utils.cc
parent29c32f903806efbc167a417c170b896dfeecc33f (diff)
downloadchromium_src-830005dd23868ae6a4fe75dab08c08ee04831ca2.zip
chromium_src-830005dd23868ae6a4fe75dab08c08ee04831ca2.tar.gz
chromium_src-830005dd23868ae6a4fe75dab08c08ee04831ca2.tar.bz2
In ChromeFrame with the moniker patch enabled we should not process optin urls in the BHO.
Fixes bug http://code.google.com/p/chromium/issues/detail?id=42155 Bug=42155 Review URL: http://codereview.chromium.org/1706003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45117 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/utils.cc')
-rw-r--r--chrome_frame/utils.cc14
1 files changed, 14 insertions, 0 deletions
diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc
index 1bc13ac..52489a1 100644
--- a/chrome_frame/utils.cc
+++ b/chrome_frame/utils.cc
@@ -1057,3 +1057,17 @@ int GetHttpResponseStatusFromBinding(IBinding* binding) {
return http_status;
}
+
+ProtocolPatchMethod GetPatchMethod() {
+ ProtocolPatchMethod patch_method =
+ static_cast<ProtocolPatchMethod>(
+ GetConfigInt(PATCH_METHOD_MONIKER, kPatchProtocols));
+ return patch_method;
+}
+
+bool MonikerPatchEnabled() {
+ ProtocolPatchMethod patch_method = GetPatchMethod();
+ LOG_IF(ERROR, patch_method != PATCH_METHOD_MONIKER)
+ << "Not running test. Moniker patch not enabled.";
+ return patch_method == PATCH_METHOD_MONIKER;
+}