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

Side by Side Diff: extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc

Issue 2494633004: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_stream_ma nager.h" 5 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_stream_ma nager.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
9 #include "components/keyed_service/content/browser_context_dependency_manager.h" 9 #include "components/keyed_service/content/browser_context_dependency_manager.h"
10 #include "components/keyed_service/content/browser_context_keyed_service_factory .h" 10 #include "components/keyed_service/content/browser_context_keyed_service_factory .h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 int render_process_id, 80 int render_process_id,
81 int render_frame_id); 81 int render_frame_id);
82 82
83 private: 83 private:
84 // WebContentsObserver overrides. 84 // WebContentsObserver overrides.
85 void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override; 85 void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
86 void RenderProcessGone(base::TerminationStatus status) override; 86 void RenderProcessGone(base::TerminationStatus status) override;
87 void DidStartProvisionalLoadForFrame( 87 void DidStartProvisionalLoadForFrame(
88 content::RenderFrameHost* render_frame_host, 88 content::RenderFrameHost* render_frame_host,
89 const GURL& validated_url, 89 const GURL& validated_url,
90 bool is_error_page, 90 bool is_error_page) override;
91 bool is_iframe_srcdoc) override;
92 void WebContentsDestroyed() override; 91 void WebContentsDestroyed() override;
93 void DidStartNavigation( 92 void DidStartNavigation(
94 content::NavigationHandle* navigation_handle) override; 93 content::NavigationHandle* navigation_handle) override;
95 void RenderFrameHostChanged(content::RenderFrameHost* old_host, 94 void RenderFrameHostChanged(content::RenderFrameHost* old_host,
96 content::RenderFrameHost* new_host) override; 95 content::RenderFrameHost* new_host) override;
97 96
98 void AbortStream(); 97 void AbortStream();
99 98
100 bool IsTrackedRenderFrameHost(content::RenderFrameHost* render_frame_host); 99 bool IsTrackedRenderFrameHost(content::RenderFrameHost* render_frame_host);
101 100
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 } 201 }
203 202
204 void MimeHandlerStreamManager::EmbedderObserver::RenderProcessGone( 203 void MimeHandlerStreamManager::EmbedderObserver::RenderProcessGone(
205 base::TerminationStatus status) { 204 base::TerminationStatus status) {
206 AbortStream(); 205 AbortStream();
207 } 206 }
208 207
209 void MimeHandlerStreamManager::EmbedderObserver:: 208 void MimeHandlerStreamManager::EmbedderObserver::
210 DidStartProvisionalLoadForFrame(content::RenderFrameHost* render_frame_host, 209 DidStartProvisionalLoadForFrame(content::RenderFrameHost* render_frame_host,
211 const GURL& validated_url, 210 const GURL& validated_url,
212 bool is_error_page, 211 bool is_error_page) {
213 bool is_iframe_srcdoc) {
214 if (!IsTrackedRenderFrameHost(render_frame_host)) 212 if (!IsTrackedRenderFrameHost(render_frame_host))
215 return; 213 return;
216 // With PlzNavigate we get a provisional load notification for the URL we are 214 // With PlzNavigate we get a provisional load notification for the URL we are
217 // serving. We don't want to clean up the stream here. 215 // serving. We don't want to clean up the stream here.
218 if (initial_load_for_frame_ && content::IsBrowserSideNavigationEnabled()) { 216 if (initial_load_for_frame_ && content::IsBrowserSideNavigationEnabled()) {
219 initial_load_for_frame_ = false; 217 initial_load_for_frame_ = false;
220 return; 218 return;
221 } 219 }
222 AbortStream(); 220 AbortStream();
223 } 221 }
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 if (frame_tree_node_id_ != -1) { 271 if (frame_tree_node_id_ != -1) {
274 return render_frame_host->GetFrameTreeNodeId() == frame_tree_node_id_; 272 return render_frame_host->GetFrameTreeNodeId() == frame_tree_node_id_;
275 } else { 273 } else {
276 DCHECK((render_frame_id_ != -1) && (render_process_id_ != -1)); 274 DCHECK((render_frame_id_ != -1) && (render_process_id_ != -1));
277 return render_frame_host->GetRoutingID() == render_frame_id_ && 275 return render_frame_host->GetRoutingID() == render_frame_id_ &&
278 render_frame_host->GetProcess()->GetID() == render_process_id_; 276 render_frame_host->GetProcess()->GetID() == render_process_id_;
279 } 277 }
280 } 278 }
281 279
282 } // namespace extensions 280 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698