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

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

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.h
diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h b/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h
index 1abb2a9b4db45c0930368e3e86f5b1b49f9dcd97..69ebd827f93d6088a6cacdb3bec611e2a30ed834 100644
--- a/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h
+++ b/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h
@@ -82,6 +82,7 @@ class ViewManagerSynchronizer : public ViewManager,
ViewManagerSynchronizer*> SynchronizerMap;
// Overridden from ViewManager:
+ virtual const std::string& GetEmbedderURL() const OVERRIDE;
virtual const std::vector<ViewTreeNode*>& GetRoots() const OVERRIDE;
virtual ViewTreeNode* GetNodeById(Id id) OVERRIDE;
virtual View* GetViewById(Id id) OVERRIDE;
@@ -92,8 +93,9 @@ class ViewManagerSynchronizer : public ViewManager,
// Overridden from IViewManagerClient:
virtual void OnViewManagerConnectionEstablished(
ConnectionSpecificId connection_id,
+ const String& creator_url,
Id next_server_change_id,
- mojo::Array<INodePtr> nodes) OVERRIDE;
+ Array<INodePtr> nodes) OVERRIDE;
virtual void OnRootsAdded(Array<INodePtr> nodes) OVERRIDE;
virtual void OnServerChangeIdAdvanced(Id next_server_change_id) OVERRIDE;
virtual void OnNodeBoundsChanged(Id node_id,
@@ -103,7 +105,7 @@ class ViewManagerSynchronizer : public ViewManager,
Id new_parent_id,
Id old_parent_id,
Id server_change_id,
- mojo::Array<INodePtr> nodes) OVERRIDE;
+ Array<INodePtr> nodes) OVERRIDE;
virtual void OnNodeDeleted(Id node_id, Id server_change_id) OVERRIDE;
virtual void OnNodeViewReplaced(Id node,
Id new_view_id,
@@ -129,6 +131,8 @@ class ViewManagerSynchronizer : public ViewManager,
ConnectionSpecificId next_id_;
Id next_server_change_id_;
+ std::string creator_url_;
+
Transactions pending_transactions_;
base::Callback<void(void)> changes_acked_callback_;
« no previous file with comments | « mojo/examples/aura_demo/aura_demo.cc ('k') | mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698