summaryrefslogtreecommitdiffstats
path: root/chrome_frame/utils.h
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-14 04:34:43 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-14 04:34:43 +0000
commit354bcbaf8603cb5800737f86a84ee465166b2b4e (patch)
tree863753d52b8f9dfb54e676bbf3d1b38a968df061 /chrome_frame/utils.h
parent0e097f90d5bba038b5826ebac2870aadde28d2ca (diff)
downloadchromium_src-354bcbaf8603cb5800737f86a84ee465166b2b4e.zip
chromium_src-354bcbaf8603cb5800737f86a84ee465166b2b4e.tar.gz
chromium_src-354bcbaf8603cb5800737f86a84ee465166b2b4e.tar.bz2
Add support for gcf:about:plugins in chrome frame full tab mode. The URL validation code path
in ChromeFrame now takes in an interface NavigationConstraints which allows the delegateslike the ActiveX, ActiveDocument and the NPAPI plugins to control the navigation decisions. We no longer refer to the InternetSecurityManager interface which is IE only for performing zone decisions in the ChromeFrame NPAPI plugin. Fixes bug http://code.google.com/p/chromium/issues/detail?id=66118 BUG=66118 TEST=Covered by additional CanNavigate unit tests. Review URL: http://codereview.chromium.org/5698005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69101 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/utils.h')
-rw-r--r--chrome_frame/utils.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome_frame/utils.h b/chrome_frame/utils.h
index 4492078..2e167d2 100644
--- a/chrome_frame/utils.h
+++ b/chrome_frame/utils.h
@@ -564,12 +564,12 @@ class ChromeFrameUrl {
std::string profile_name_;
};
+class NavigationConstraints;
// Returns true if we can navigate to this URL.
-// This function checks if the url scheme is valid for navigation within
-// chrome and whether it is a restricted URL as per IE settings. In either of
-// these cases it returns false.
-bool CanNavigate(const GURL& url, IInternetSecurityManager* security_manager,
- bool is_privileged);
+// These decisions are controlled by the NavigationConstraints object passed
+// in.
+bool CanNavigate(const GURL& url,
+ NavigationConstraints* navigation_constraints);
// Utility function that prevents the current module from ever being unloaded.
// Call if you make irreversible patches.