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

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

Issue 463523003: Fix an issue with view manager init service where you had to retain a connection to the init servic… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 4 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 a070373c1d85de0c141abe1ef55177596de9085a..64a206a65e939c0d03f1f16a8d5c7b95fe43f76a 100644
--- a/mojo/services/view_manager/view_manager_init_service_impl.h
+++ b/mojo/services/view_manager/view_manager_init_service_impl.h
@@ -9,7 +9,6 @@
#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/view_manager_export.h"
@@ -17,7 +16,6 @@
namespace mojo {
class ApplicationConnection;
-class ServiceProvider;
namespace service {
@@ -39,22 +37,7 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerInitServiceImpl
ViewManagerInitServiceContext* context);
virtual ~ViewManagerInitServiceImpl();
- void OnNativeViewportDeleted();
-
- void OnRootViewManagerWindowTreeHostCreated();
-
private:
- struct ConnectParams {
- ConnectParams();
- ~ConnectParams();
-
- std::string url;
- InterfaceRequest<ServiceProvider> service_provider;
- Callback<void(bool)> callback;
- };
-
- void MaybeEmbed();
-
// ViewManagerInitService overrides:
virtual void Embed(const String& url,
ServiceProviderPtr service_provider,
@@ -62,14 +45,6 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerInitServiceImpl
ViewManagerInitServiceContext* context_;
- ServiceProvider* service_provider_;
-
- // 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_;
-
DISALLOW_COPY_AND_ASSIGN(ViewManagerInitServiceImpl);
};

Powered by Google App Engine
This is Rietveld 408576698