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

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

Issue 383763003: Trigger Node destruction notifications from Node's dtor (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_service_impl.h
diff --git a/mojo/services/view_manager/view_manager_service_impl.h b/mojo/services/view_manager/view_manager_service_impl.h
index 7da14db8e564b7b5704cd3bb31395965667b79c1..42dbb817f54e60eb2a6022fbed8b83c1a5f2fb0d 100644
--- a/mojo/services/view_manager/view_manager_service_impl.h
+++ b/mojo/services/view_manager/view_manager_service_impl.h
@@ -14,7 +14,6 @@
#include "base/containers/hash_tables.h"
#include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
#include "mojo/services/view_manager/ids.h"
-#include "mojo/services/view_manager/node_delegate.h"
#include "mojo/services/view_manager/view_manager_export.h"
namespace gfx {
@@ -38,8 +37,7 @@ class View;
// Manages a connection from the client.
class MOJO_VIEW_MANAGER_EXPORT ViewManagerServiceImpl
- : public InterfaceImpl<ViewManagerService>,
- public NodeDelegate {
+ : public InterfaceImpl<ViewManagerService> {
public:
ViewManagerServiceImpl(RootNodeManager* root_node_manager,
ConnectionSpecificId creator_id,
@@ -216,19 +214,6 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerServiceImpl
virtual void DispatchOnViewInputEvent(Id transport_view_id,
EventPtr event) OVERRIDE;
- // Overridden from NodeDelegate:
- virtual void OnNodeHierarchyChanged(const Node* node,
- const Node* new_parent,
- const Node* old_parent) OVERRIDE;
- virtual void OnNodeBoundsChanged(const Node* node,
- const gfx::Rect& old_bounds,
- const gfx::Rect& new_bounds) OVERRIDE;
- virtual void OnNodeViewReplaced(const Node* node,
- const View* new_view,
- const View* old_view) OVERRIDE;
- virtual void OnViewInputEvent(const View* view,
- const ui::Event* event) OVERRIDE;
-
// InterfaceImp overrides:
virtual void OnConnectionEstablished() MOJO_OVERRIDE;
@@ -247,8 +232,9 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerServiceImpl
// The URL of the app that embedded the app this connection was created for.
const std::string creator_url_;
+ // The nodes and views created by this connection. This connection owns these
+ // objects.
NodeMap node_map_;
-
ViewMap view_map_;
// The set of nodes that has been communicated to the client.
« no previous file with comments | « mojo/services/view_manager/root_node_manager.cc ('k') | mojo/services/view_manager/view_manager_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698