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

Unified Diff: chrome_frame/chrome_frame_automation.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_frame_automation.cc
===================================================================
--- chrome_frame/chrome_frame_automation.cc (revision 68604)
+++ chrome_frame/chrome_frame_automation.cc (working copy)
@@ -654,17 +654,7 @@
init_state_ = INITIALIZING;
HRESULT hr = S_OK;
- // If chrome crashed and is being restarted, the security_manager_ object
- // might already be valid.
- if (security_manager_.get() == NULL)
- hr = security_manager_.CreateInstance(CLSID_InternetSecurityManager);
- if (FAILED(hr)) {
- NOTREACHED() << __FUNCTION__
- << " Failed to create InternetSecurityManager. Error: 0x%x"
- << hr;
- }
-
if (chrome_launch_params_->url().is_valid())
navigate_after_initialization_ = false;
@@ -720,8 +710,10 @@
init_state_ = UNINITIALIZED;
}
-bool ChromeFrameAutomationClient::InitiateNavigation(const std::string& url,
- const std::string& referrer, bool is_privileged) {
+bool ChromeFrameAutomationClient::InitiateNavigation(
+ const std::string& url,
+ const std::string& referrer,
+ NavigationConstraints* navigation_constraints) {
if (url.empty())
return false;
@@ -729,7 +721,7 @@
// Catch invalid URLs early.
// Can we allow this navigation to happen?
- if (!CanNavigate(parsed_url, security_manager_, is_privileged)) {
+ if (!CanNavigate(parsed_url, navigation_constraints)) {
DLOG(ERROR) << __FUNCTION__ << " Not allowing navigation to: " << url;
return false;
}

Powered by Google App Engine
This is Rietveld 408576698