Minor cleanup of view manager

mojo/services/view_manager/view_manager_service_impl.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 31 matching lines @@
       public AccessPolicyDelegate {
  public:
   ViewManagerServiceImpl(ConnectionManager* connection_manager,
                          ConnectionSpecificId creator_id,
                          const std::string& creator_url,
                          const std::string& url,
                          const ViewId& root_id,
                          InterfaceRequest<ServiceProvider> service_provider);
   ~ViewManagerServiceImpl() override;
 
-  // Used to mark this connection as originating from a call to
-  // ViewManagerService::Connect(). When set OnConnectionError() deletes |this|.
-  void set_delete_on_connection_error() { delete_on_connection_error_ = true; }
-
   ConnectionSpecificId id() const { return id_; }
   ConnectionSpecificId creator_id() const { return creator_id_; }
   const std::string& url() const { return url_; }
 
   // Returns the View with the specified id.
   ServerView* GetView(const ViewId& id) {
     return const_cast<ServerView*>(
         const_cast<const ViewManagerServiceImpl*>(this)->GetView(id));
   }
   const ServerView* GetView(const ViewId& id) const;
@@ skipping 79 matching lines @@
 
   // Implementation of GetViewTree(). Adds |view| to |views| and recurses if
   // CanDescendIntoViewForViewTree() returns true.
   void GetViewTreeImpl(const ServerView* view,
                        std::vector<const ServerView*>* views) const;
 
   // Notify the client if the drawn state of any of the roots changes.
   // |view| is the view that is changing to the drawn state |new_drawn_value|.
   void NotifyDrawnStateChanged(const ServerView* view, bool new_drawn_value);
 
+  // Deletes all Views we own.
+  void DestroyViews();
+
   // ViewManagerService:
   void CreateView(Id transport_view_id,
                   const Callback<void(ErrorCode)>& callback) override;
   void DeleteView(Id transport_view_id,
                   const Callback<void(bool)>& callback) override;
   void AddView(Id parent_id,
                Id child_id,
                const Callback<void(bool)>& callback) override;
   void RemoveViewFromParent(Id view_id,
                             const Callback<void(bool)>& callback) override;
@@ skipping 55 matching lines @@
   ViewIdSet known_views_;
 
   // Set of root views from other connections. More specifically any time
   // Embed() is invoked the id of the view is added to this set for the child
   // connection. The connection Embed() was invoked on (the parent) doesn't
   // directly track which connections are attached to which of its views. That
   // information can be found by looking through the |roots_| of all
   // connections.
   ViewIdSet roots_;
 
-  // See description above setter.
-  bool delete_on_connection_error_;
-
   InterfaceRequest<ServiceProvider> service_provider_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerServiceImpl);
 };
 
 #if defined(OS_WIN)
 #pragma warning(pop)
 #endif
 
 }  // namespace service
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_