c++ / mojo changes for 'external window mode'

services/ui/ws/window_tree.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_WS_WINDOW_TREE_H_
 #define SERVICES_UI_WS_WINDOW_TREE_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 59 matching lines @@
  public:
   WindowTree(WindowServer* window_server,
              const UserId& user_id,
              ServerWindow* root,
              std::unique_ptr<AccessPolicy> access_policy);
   ~WindowTree() override;
 
   void Init(std::unique_ptr<WindowTreeBinding> binding,
             mojom::WindowTreePtr tree);
 
+  // Call WindowTreeClient::OnEmbed.

[fwang, 2017/02/28 08:23:53]

I think it's "Calls" for consistency with other comments.

[tonikitoo, 2017/03/01 05:05:44]

Done.

+  void DoOnEmbed(mojom::WindowTreePtr tree, ServerWindow* root);
+
   // Called if this WindowTree hosts a WindowManager.
   void ConfigureWindowManager();
 
   ClientSpecificId id() const { return id_; }
 
   void set_embedder_intercepts_events() { embedder_intercepts_events_ = true; }
   bool embedder_intercepts_events() const {
     return embedder_intercepts_events_;
   }
 
@@ skipping 56 matching lines @@
   DisplayManager* display_manager();
   const DisplayManager* display_manager() const;
 
   WindowServer* window_server() { return window_server_; }
   const WindowServer* window_server() const { return window_server_; }
 
   // Called from ~WindowServer. Reset WindowTreeClient so that it no longer gets
   // any messages.
   void PrepareForWindowServerShutdown();
 
+  // Adds a new root to this tree.
+  void AddRoot(const ServerWindow* root);
+
   // Adds a new root to this tree. This is only valid for window managers.
   void AddRootForWindowManager(const ServerWindow* root);
 
   // Invoked when a tree is about to be destroyed.
   void OnWindowDestroyingTreeImpl(WindowTree* tree);
 
   // Sends updated display information.
   void OnWmDisplayModified(const display::Display& display);
 
   // These functions are synchronous variants of those defined in the mojom. The
@@ skipping 412 matching lines @@
       waiting_for_top_level_window_info_;
   bool embedder_intercepts_events_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTree);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_WINDOW_TREE_H_