Changes ownership of WindowTreeClient

services/ui/public/cpp/window_tree_client.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 SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_
 #define SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 28 matching lines @@
 
 namespace ui {
 class InFlightChange;
 class WindowTreeClientDelegate;
 class WindowTreeClientPrivate;
 class WindowTreeClientObserver;
 enum class ChangeType;
 
 // Manages the connection with mus.
 //
-// WindowTreeClient is deleted by any of the following:
-// . If all the roots of the connection are destroyed and the connection is
-//   configured to delete when there are no roots (true if the WindowTreeClient
-//   is created with a mojom::WindowTreeClientRequest). This happens
-//   if the owner of the roots Embed()s another app in all the roots, or all
-//   the roots are explicitly deleted.
-// . The connection to mus is lost.
-// . Explicitly by way of calling delete.
+// WindowTreeClient is owned by the creator. Generally when the delegate gets
+// one of OnEmbedRootDestroyed() or OnLostConnection() it should delete the
+// WindowTreeClient.
 //
 // When WindowTreeClient is deleted all windows are deleted (and observers
-// notified). This is followed by calling
-// WindowTreeClientDelegate::OnDidDestroyClient().
+// notified).
 class WindowTreeClient : public mojom::WindowTreeClient,
                          public mojom::WindowManager,
                          public WindowManagerClient {
  public:
   WindowTreeClient(WindowTreeClientDelegate* delegate,
                    WindowManagerDelegate* window_manager_delegate,
                    mojom::WindowTreeClientRequest request);
   ~WindowTreeClient() override;
 
   // Establishes the connection by way of the WindowTreeFactory.
@@ skipping 78 matching lines @@
   bool IsRoot(Window* window) const { return roots_.count(window) > 0; }
 
   void OnWindowDestroying(Window* window);
 
   // Called after the window's observers have been notified of destruction (as
   // the last step of ~Window).
   void OnWindowDestroyed(Window* window);
 
   Window* GetWindowByServerId(Id id);
 
-  // Sets whether this is deleted when there are no roots. The default is to
-  // delete when there are no roots.
-  void SetDeleteOnNoRoots(bool value);
-
   // Returns the root of this connection.
   const std::set<Window*>& GetRoots();
 
   // Returns the Window with input capture; null if no window has requested
   // input capture, or if another app has capture.
   Window* GetCaptureWindow();
 
   // Returns the focused window; null if focus is not yet known or another app
   // is focused.
   Window* GetFocusedWindow();
@@ skipping 222 matching lines @@
   Window* capture_window_;
 
   Window* focused_window_;
 
   mojo::Binding<mojom::WindowTreeClient> binding_;
   mojom::WindowTreePtr tree_ptr_;
   // Typically this is the value contained in |tree_ptr_|, but tests may
   // directly set this.
   mojom::WindowTree* tree_;
 
-  bool delete_on_no_roots_;
+  // Set to true if OnEmbed() was received.
+  bool is_from_embed_ = false;
 
   bool in_destructor_;

[sadrul, 2016/09/02 17:04:15]

Sidenote: should we switch to default initializing these in the header when
possible?

[sky, 2016/09/06 17:15:42]

Yes, but I'll keep that to a separate patch.

 
   // A mapping to shared memory that is one 32 bit integer long. The window
   // server uses this to let us synchronously read the cursor location.
   mojo::ScopedSharedBufferMapping cursor_location_mapping_;
 
   base::ObserverList<WindowTreeClientObserver> observers_;
 
   std::unique_ptr<mojo::AssociatedBinding<mojom::WindowManager>>
       window_manager_internal_;
   mojom::WindowManagerClientAssociatedPtr window_manager_internal_client_;
@@ skipping 12 matching lines @@
   base::Callback<void(bool)> on_current_move_finished_;
 
   base::WeakPtrFactory<WindowTreeClient> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeClient);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_