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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1770533002: Change userid from a uint32_t to a string guid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@33connector
Patch Set: . Created 4 years, 9 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 | « content/public/browser/browser_context.h ('k') | content/test/data/web_ui_mojo_shell_test.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index f0e6b9f8c4fe93ec7444d4c4cc1988c5597c3b0f..2c943e50f6fe669a5b630dff4d098c5a03794246 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -625,7 +625,7 @@ bool IsReload(FrameMsg_Navigate_Type::Value navigation_type) {
RenderFrameImpl::CreateRenderFrameImplFunction g_create_render_frame_impl =
nullptr;
-void OnGotInstanceID(uint32_t instance_id, uint32_t user_id) {}
+void OnGotInstanceID(const std::string& user_id, uint32_t instance_id) {}
WebString ConvertRelativePathToHtmlAttribute(const base::FilePath& path) {
DCHECK(!path.IsAbsolute());
@@ -6087,9 +6087,9 @@ mojo::shell::mojom::InterfaceProviderPtr RenderFrameImpl::ConnectToApplication(
if (!connector_)
GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&connector_));
mojo::shell::mojom::InterfaceProviderPtr interface_provider;
- connector_->Connect(
- url.spec(), mojo::shell::mojom::Connector::kUserInherit,
- GetProxy(&interface_provider), nullptr, base::Bind(&OnGotInstanceID));
+ connector_->Connect(url.spec(), mojo::shell::mojom::kInheritUserID,
+ GetProxy(&interface_provider), nullptr,
+ base::Bind(&OnGotInstanceID));
return interface_provider;
}
« no previous file with comments | « content/public/browser/browser_context.h ('k') | content/test/data/web_ui_mojo_shell_test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698