Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(783)

Unified Diff: chrome_frame/chrome_frame_npapi.cc

Issue 5814004: Fixing a regression introduced with r69101, which now prevents Chrome Frame... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/chrome_frame_npapi.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/chrome_frame_npapi.cc
===================================================================
--- chrome_frame/chrome_frame_npapi.cc (revision 69128)
+++ chrome_frame/chrome_frame_npapi.cc (working copy)
@@ -11,6 +11,7 @@
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/utf_string_conversions.h"
+#include "chrome/common/url_constants.h"
#include "chrome/test/automation/tab_proxy.h"
#include "chrome_frame/ff_privilege_check.h"
#include "chrome_frame/np_utils.h"
@@ -418,6 +419,19 @@
print_bounds);
}
+bool ChromeFrameNPAPI::IsSchemeAllowed(const GURL& url) {
amit 2010/12/14 19:37:58 This looks identical to the ActiveX version. So ma
+ bool allowed = NavigationConstraintsImpl::IsSchemeAllowed(url);
+ if (allowed)
+ return true;
+
+ if (is_privileged_ &&
+ (url.SchemeIs(chrome::kDataScheme) ||
+ url.SchemeIs(chrome::kExtensionScheme))) {
+ return true;
+ }
+ return false;
+}
+
void ChromeFrameNPAPI::UrlNotify(const char* url, NPReason reason,
void* notify_data) {
if (enabled_popups_) {
« no previous file with comments | « chrome_frame/chrome_frame_npapi.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698