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

Unified Diff: mojo/services/view_manager/view_manager_init_service_impl.h

Issue 405163002: Add EmbedRoot to ViewManagerService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 5 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/view_manager/view_manager_init_service_impl.h
diff --git a/mojo/services/view_manager/view_manager_init_service_impl.h b/mojo/services/view_manager/view_manager_init_service_impl.h
index b9b5b3bff61143bcbb8e4cf15fb9a75f11b3886a..f659df98a366bffeefc9c92a09a1b5d7efeb0118 100644
--- a/mojo/services/view_manager/view_manager_init_service_impl.h
+++ b/mojo/services/view_manager/view_manager_init_service_impl.h
@@ -9,6 +9,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/memory/scoped_vector.h"
#include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
#include "mojo/services/view_manager/root_node_manager.h"
#include "mojo/services/view_manager/root_view_manager_delegate.h"
@@ -47,12 +48,11 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerInitServiceImpl
Callback<void(bool)> callback;
};
- void MaybeEmbedRoot(const std::string& url,
- const Callback<void(bool)>& callback);
+ void MaybeEmbed();
// ViewManagerInitService overrides:
- virtual void EmbedRoot(const String& url,
- const Callback<void(bool)>& callback) OVERRIDE;
+ virtual void Embed(const String& url,
+ const Callback<void(bool)>& callback) OVERRIDE;
// RootViewManagerDelegate overrides:
virtual void OnRootViewManagerWindowTreeHostCreated() OVERRIDE;
@@ -63,8 +63,9 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerInitServiceImpl
RootNodeManager root_node_manager_;
- // Parameters passed to Connect(). If non-null Connect() has been invoked.
- scoped_ptr<ConnectParams> connect_params_;
+ // Stores information about inbound calls to Embed() pending execution on
+ // the window tree host being ready to use.
+ ScopedVector<ConnectParams> connect_params_;
bool is_tree_host_ready_;
« no previous file with comments | « mojo/services/view_manager/test_change_tracker.cc ('k') | mojo/services/view_manager/view_manager_init_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698