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

Side by Side Diff: content/browser/frame_host/render_frame_host_manager.cc

Issue 2420253002: Rename shell namespace to service_manager (Closed)
Patch Set: . Created 4 years, 2 months 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/browser/frame_host/render_frame_host_manager.h" 5 #include "content/browser/frame_host/render_frame_host_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <utility> 10 #include <utility>
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 MSG_ROUTING_NONE, frame_tree_node_->current_replication_state()); 223 MSG_ROUTING_NONE, frame_tree_node_->current_replication_state());
224 } 224 }
225 225
226 // If the renderer isn't live, then try to create a new one to satisfy this 226 // If the renderer isn't live, then try to create a new one to satisfy this
227 // navigation request. 227 // navigation request.
228 if (!dest_render_frame_host->IsRenderFrameLive()) { 228 if (!dest_render_frame_host->IsRenderFrameLive()) {
229 // Instruct the destination render frame host to set up a Mojo connection 229 // Instruct the destination render frame host to set up a Mojo connection
230 // with the new render frame if necessary. Note that this call needs to 230 // with the new render frame if necessary. Note that this call needs to
231 // occur before initializing the RenderView; the flow of creating the 231 // occur before initializing the RenderView; the flow of creating the
232 // RenderView can cause browser-side code to execute that expects the this 232 // RenderView can cause browser-side code to execute that expects the this
233 // RFH's shell::InterfaceRegistry to be initialized (e.g., if the site is a 233 // RFH's service_manager::InterfaceRegistry to be initialized (e.g., if the
234 // site is a
234 // WebUI site that is handled via Mojo, then Mojo WebUI code in //chrome 235 // WebUI site that is handled via Mojo, then Mojo WebUI code in //chrome
235 // will add an interface to this RFH's InterfaceRegistry). 236 // will add an interface to this RFH's InterfaceRegistry).
236 dest_render_frame_host->SetUpMojoIfNeeded(); 237 dest_render_frame_host->SetUpMojoIfNeeded();
237 238
238 if (!ReinitializeRenderFrame(dest_render_frame_host)) 239 if (!ReinitializeRenderFrame(dest_render_frame_host))
239 return nullptr; 240 return nullptr;
240 241
241 if (GetNavigatingWebUI()) { 242 if (GetNavigatingWebUI()) {
242 // A new RenderView was created and there is a navigating WebUI which 243 // A new RenderView was created and there is a navigating WebUI which
243 // never interacted with it. So notify the WebUI using RenderViewCreated. 244 // never interacted with it. So notify the WebUI using RenderViewCreated.
(...skipping 2464 matching lines...) Expand 10 before | Expand all | Expand 10 after
2708 resolved_url)) { 2709 resolved_url)) {
2709 DCHECK(!dest_instance || 2710 DCHECK(!dest_instance ||
2710 dest_instance == render_frame_host_->GetSiteInstance()); 2711 dest_instance == render_frame_host_->GetSiteInstance());
2711 return false; 2712 return false;
2712 } 2713 }
2713 2714
2714 return true; 2715 return true;
2715 } 2716 }
2716 2717
2717 } // namespace content 2718 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.cc ('k') | content/browser/gpu/browser_gpu_channel_host_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698