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

Unified Diff: chrome_frame/chrome_active_document.cc

Issue 5698005: Add support for gcf:about:plugins in chrome frame full tab mode. The URL vali... (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
Index: chrome_frame/chrome_active_document.cc
===================================================================
--- chrome_frame/chrome_active_document.cc (revision 68604)
+++ chrome_frame/chrome_active_document.cc (working copy)
@@ -464,6 +464,12 @@
return GetUrlForEvents(url);
}
+STDMETHODIMP ChromeActiveDocument::PutProperty(
+ MONIKERPROPERTY moniker_prop, LPCWSTR value) {
+ return S_OK;
+}
+
+
STDMETHODIMP ChromeActiveDocument::Reset() {
next_privacy_record_ = privacy_info_.privacy_records.begin();
return S_OK;
@@ -501,6 +507,18 @@
return S_OK;
}
+bool ChromeActiveDocument::IsSchemeAllowed(const GURL& url) {
+ bool allowed = BaseActiveX::IsSchemeAllowed(url);
+ if (allowed)
+ return true;
+
+ if (url.SchemeIs(chrome::kAboutScheme)) {
+ if (LowerCaseEqualsASCII(url.spec(), chrome::kAboutPluginsURL))
+ return true;
+ }
+ return false;
+}
+
HRESULT ChromeActiveDocument::GetInPlaceFrame(
IOleInPlaceFrame** in_place_frame) {
DCHECK(in_place_frame);
@@ -1032,7 +1050,7 @@
SetWindowDimensions();
} else if (!automation_client_->InitiateNavigation(cf_url.gurl().spec(),
referrer,
- is_privileged_)) {
+ this)) {
DLOG(ERROR) << "Invalid URL: " << url_;
Error(L"Invalid URL");
url_.Reset();

Powered by Google App Engine
This is Rietveld 408576698