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

Unified Diff: mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc

Issue 322923002: Pass embedding app identity through at embed time (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 6 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: mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc
diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc b/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc
index 555673d28bb36da38c937b3084e5cd798d8a884a..5b8e8bb77068c5b9d0f7132125d010ca64c07b6f 100644
--- a/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc
+++ b/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc
@@ -597,6 +597,10 @@ void ViewManagerSynchronizer::RemoveView(Id view_id) {
////////////////////////////////////////////////////////////////////////////////
// ViewManagerSynchronizer, ViewManager implementation:
+const std::string& ViewManagerSynchronizer::GetEmbedderURL() const {
+ return creator_url_;
+}
+
const std::vector<ViewTreeNode*>& ViewManagerSynchronizer::GetRoots() const {
return roots_;
}
@@ -623,10 +627,12 @@ void ViewManagerSynchronizer::OnConnectionEstablished() {
void ViewManagerSynchronizer::OnViewManagerConnectionEstablished(
ConnectionSpecificId connection_id,
+ const String& creator_url,
Id next_server_change_id,
- mojo::Array<INodePtr> nodes) {
+ Array<INodePtr> nodes) {
connected_ = true;
connection_id_ = connection_id;
+ creator_url_ = TypeConverter<String, std::string>::ConvertFrom(creator_url);
next_server_change_id_ = next_server_change_id;
DCHECK(pending_transactions_.empty());

Powered by Google App Engine
This is Rietveld 408576698