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

Unified Diff: content/browser/frame_host/navigator_impl.cc

Issue 2534393003: (Reland) Remove about:srcdoc url conversion. (Closed)
Patch Set: Rebase. Created 4 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: content/browser/frame_host/navigator_impl.cc
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
index 44873594afe061d98414abd3f993b87c5ff7d9de..4023da6dc9d6280475709e8508e71129601f4ff8 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -45,10 +45,8 @@
#include "content/public/common/content_client.h"
#include "content/public/common/content_constants.h"
#include "content/public/common/resource_response.h"
-#include "content/public/common/url_constants.h"
#include "net/base/net_errors.h"
#include "url/gurl.h"
-#include "url/url_constants.h"
namespace content {
@@ -147,7 +145,6 @@ void NavigatorImpl::DidStartProvisionalLoad(
NavigationGesture gesture) {
bool is_main_frame = render_frame_host->frame_tree_node()->IsMainFrame();
bool is_error_page = (url.spec() == kUnreachableWebDataURL);
- bool is_iframe_srcdoc = (url.spec() == kAboutSrcDocURL);
GURL validated_url(url);
RenderProcessHost* render_process_host = render_frame_host->GetProcess();
render_process_host->FilterURL(false, &validated_url);
@@ -170,7 +167,7 @@ void NavigatorImpl::DidStartProvisionalLoad(
if (delegate_) {
// Notify the observer about the start of the provisional load.
delegate_->DidStartProvisionalLoad(render_frame_host, validated_url,
- is_error_page, is_iframe_srcdoc);
+ is_error_page);
}
if (is_error_page || IsBrowserSideNavigationEnabled())
@@ -208,8 +205,7 @@ void NavigatorImpl::DidStartProvisionalLoad(
render_frame_host->SetNavigationHandle(NavigationHandleImpl::Create(
validated_url, render_frame_host->frame_tree_node(),
is_renderer_initiated,
- false, // is_same_page
- is_iframe_srcdoc, // is_srcdoc
+ false, // is_same_page
navigation_start, pending_nav_entry_id, gesture,
started_from_context_menu));
}
« no previous file with comments | « content/browser/frame_host/navigator_delegate.h ('k') | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698