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

Unified Diff: components/web_view/frame_connection.cc

Issue 1578473002: Pass application ids via AcceptConnection & ConnectToApplication callback. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 11 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
Index: components/web_view/frame_connection.cc
diff --git a/components/web_view/frame_connection.cc b/components/web_view/frame_connection.cc
index a29b0501ef050818376e3ca723d90e9ec8ab4d1d..c9cf5f940ae24b47133018ed053e1a412904c3e8 100644
--- a/components/web_view/frame_connection.cc
+++ b/components/web_view/frame_connection.cc
@@ -118,7 +118,7 @@ void FrameConnection::Init(mojo::ApplicationImpl* app,
params.set_filter(std::move(filter));
application_connection_ = app->ConnectToApplication(&params);
application_connection_->ConnectToService(&frame_client_);
- application_connection_->AddContentHandlerIDCallback(on_got_id_callback);
+ application_connection_->AddRemoteIDCallback(on_got_id_callback);
}
mus::mojom::WindowTreeClientPtr FrameConnection::GetWindowTreeClient() {
@@ -129,8 +129,8 @@ mus::mojom::WindowTreeClientPtr FrameConnection::GetWindowTreeClient() {
}
uint32_t FrameConnection::GetContentHandlerID() const {
- uint32_t content_handler_id = mojo::Shell::kInvalidContentHandlerID;
- if (!application_connection_->GetContentHandlerID(&content_handler_id))
+ uint32_t content_handler_id = mojo::Shell::kInvalidApplicationID;
+ if (!application_connection_->GetRemoteContentHandlerID(&content_handler_id))
NOTREACHED();
return content_handler_id;
}

Powered by Google App Engine
This is Rietveld 408576698