Index: mojo/services/view_manager/view_manager_init_service_context.h |
diff --git a/mojo/services/view_manager/view_manager_init_service_context.h b/mojo/services/view_manager/view_manager_init_service_context.h |
index b87b9a327a6ace55166941be92f842937b3162d1..5019c68e7d0e3a797db59b70b54ebb115b0b2b5f 100644 |
--- a/mojo/services/view_manager/view_manager_init_service_context.h |
+++ b/mojo/services/view_manager/view_manager_init_service_context.h |
@@ -5,24 +5,22 @@ |
#ifndef MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_INIT_SERVICE_CONTEXT_H_ |
#define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_INIT_SERVICE_CONTEXT_H_ |
-#include <set> |
- |
#include "base/memory/scoped_ptr.h" |
-#include "base/memory/scoped_vector.h" |
-#include "mojo/public/cpp/application/application_connection.h" |
-#include "mojo/public/cpp/application/application_delegate.h" |
-#include "mojo/services/view_manager/display_manager_delegate.h" |
+#include "mojo/public/cpp/bindings/callback.h" |
+#include "mojo/public/cpp/bindings/interface_request.h" |
+#include "mojo/public/interfaces/application/service_provider.mojom.h" |
#include "mojo/services/view_manager/view_manager_export.h" |
namespace mojo { |
+class ApplicationConnection; |
+ |
namespace service { |
class ConnectionManager; |
class ViewManagerInitServiceImpl; |
// State shared between all ViewManagerInitService impls. |
-class MOJO_VIEW_MANAGER_EXPORT ViewManagerInitServiceContext |
- : public DisplayManagerDelegate { |
+class MOJO_VIEW_MANAGER_EXPORT ViewManagerInitServiceContext { |
public: |
ViewManagerInitServiceContext(); |
virtual ~ViewManagerInitServiceContext(); |
@@ -38,8 +36,6 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerInitServiceContext |
ConnectionManager* connection_manager() { return connection_manager_.get(); } |
- bool is_tree_host_ready() const { return is_tree_host_ready_; } |
- |
private: |
typedef std::vector<ViewManagerInitServiceImpl*> Connections; |
@@ -52,22 +48,11 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerInitServiceContext |
Callback<void(bool)> callback; |
}; |
- // DisplayManagerDelegate overrides: |
- virtual void OnDisplayManagerWindowTreeHostCreated() OVERRIDE; |
- |
void OnNativeViewportDeleted(); |
- void MaybeEmbed(); |
- |
scoped_ptr<ConnectionManager> connection_manager_; |
Connections connections_; |
- // 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_; |
- |
bool deleting_connection_; |
DISALLOW_COPY_AND_ASSIGN(ViewManagerInitServiceContext); |