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

Unified Diff: mojo/services/view_manager/public/cpp/view_manager_delegate.h

Issue 795593004: Update mojo sdk to rev cc531b32182099a5a034a99daff35ed5d38a61c8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More workarounds for MSVC Created 6 years 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/view_manager/public/cpp/view_manager_delegate.h
diff --git a/mojo/services/view_manager/public/cpp/view_manager_delegate.h b/mojo/services/view_manager/public/cpp/view_manager_delegate.h
index 9513a359ee08c0be41197112dad62e5c3b919297..11608617122528bda30a0950bf068f18855aec8f 100644
--- a/mojo/services/view_manager/public/cpp/view_manager_delegate.h
+++ b/mojo/services/view_manager/public/cpp/view_manager_delegate.h
@@ -18,21 +18,17 @@ class ViewManager;
class ViewManagerDelegate {
public:
// Called when the application implementing this interface is embedded at
- // |root|. |view_manager| is an implementation of an object bound to a
- // connection to the view manager service. The object is valid until
+ // |root|. Every embed results in a new ViewManager and root View being
+ // created. |root| and it's corresponding ViewManager are valid until
// OnViewManagerDisconnected() is called with the same object.
- // This function is called for every embed, but there will be a unique
- // instance of |view_manager| only for every unique connection. See
- // the class description of ViewManager for some rules about when a new
- // connection is made.
+ //
// |exported_services| is an object that the delegate can add services to
// expose to the embedder. |imported_services| exposes the services offered by
// the embedder to the delegate. Note that if a different application is
// subsequently embedded at |root|, the pipe(s) connecting |imported_services|
// to the embedder and any services obtained from it are not broken and will
// continue to be valid.
- virtual void OnEmbed(ViewManager* view_manager,
- View* root,
+ virtual void OnEmbed(View* root,
ServiceProviderImpl* exported_services,
scoped_ptr<ServiceProvider> imported_services) = 0;
« no previous file with comments | « mojo/services/view_manager/public/cpp/view_manager.h ('k') | mojo/services/view_manager/public/cpp/view_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698