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

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

Issue 1889253002: Remove uses of shell::Loader from content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/mojo/browser_shell_connection.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/frame_mojo_shell.cc
diff --git a/content/browser/frame_host/frame_mojo_shell.cc b/content/browser/frame_host/frame_mojo_shell.cc
index 8eb6f7041759e0bf4ee57b6c9e587796c767c37b..d40ec40139d08be76b1161ede87b09d0c27adc6c 100644
--- a/content/browser/frame_host/frame_mojo_shell.cc
+++ b/content/browser/frame_host/frame_mojo_shell.cc
@@ -9,7 +9,6 @@
#include "build/build_config.h"
#include "content/browser/mojo/mojo_shell_context.h"
#include "content/common/mojo/service_registry_impl.h"
-#include "content/public/browser/browser_context.h"
#include "content/public/browser/content_browser_client.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_process_host.h"
@@ -58,10 +57,8 @@ void FrameMojoShell::Connect(
shell::mojom::InterfaceProviderPtr frame_services;
service_provider_bindings_.AddBinding(GetServiceRegistry(),
GetProxy(&frame_services));
- std::string mojo_user_id = BrowserContext::GetMojoUserIdFor(
- frame_host_->GetProcess()->GetBrowserContext());
MojoShellContext::ConnectToApplication(
- mojo_user_id, target->name,
+ shell::mojom::kRootUserID, target->name,
Ken Rockot(use gerrit already) 2016/04/15 18:30:16 I realize we don't want to use "root" for anything
frame_host_->GetSiteInstance()->GetSiteURL().spec(), std::move(services),
std::move(frame_services), callback);
}
« no previous file with comments | « no previous file | content/browser/mojo/browser_shell_connection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698