Create a RegisterViewAssociate method in ViewManager

services/ui/view_manager/view_registry.cc

 // Copyright 2015 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.
 
 #include "services/ui/view_manager/view_registry.h"
 
 #include <algorithm>
 #include <cmath>
 #include <utility>
 
@@ skipping 41 matching lines @@
   if (overrides->view_layout)
     value->view_layout = overrides->view_layout.Clone();
 }
 }  // namespace
 
 ViewRegistry::ViewRegistry(mojo::gfx::composition::CompositorPtr compositor)
     : compositor_(compositor.Pass()) {}
 
 ViewRegistry::~ViewRegistry() {}
 
-void ViewRegistry::ConnectAssociates(
-    mojo::ApplicationImpl* app_impl,
-    const std::vector<std::string>& urls,
-    const AssociateConnectionErrorCallback& connection_error_callback) {
-  associate_table_.ConnectAssociates(app_impl, this, urls,
-                                     connection_error_callback);
+// REGISTERING ASSOCIATES
+
+void ViewRegistry::RegisterViewAssociate(
+    mojo::ui::ViewInspector* view_inspector,
+    mojo::ui::ViewAssociatePtr view_associate,
+    mojo::InterfaceRequest<mojo::ui::ViewAssociateOwner> view_associate_owner,
+    const mojo::String& label) {
+  associate_table_.RegisterViewAssociate(view_inspector, view_associate.Pass(),

[jeffbrown, 2016/05/18 18:07:16]

Please sanitize the label here before using it.  See CreateView for example.

[mikejurka, 2016/05/18 19:09:10]

Done.

+                                         view_associate_owner.Pass(), label);
 }
 
+void ViewRegistry::FinishedRegisteringViewAssociates() {
+  associate_table_.FinishedRegisteringViewAssociates();
+};
+
 // CREATE / DESTROY VIEWS
 
 void ViewRegistry::CreateView(
     mojo::InterfaceRequest<mojo::ui::View> view_request,
     mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request,
     mojo::ui::ViewListenerPtr view_listener,
     const mojo::String& label) {
   DCHECK(view_request.is_pending());
   DCHECK(view_owner_request.is_pending());
   DCHECK(view_listener);
@@ skipping 687 matching lines @@
   auto it = views_by_token_.find(view_token_value);
   return it != views_by_token_.end() ? it->second : nullptr;
 }
 
 ViewTreeState* ViewRegistry::FindViewTree(uint32_t view_tree_token_value) {
   auto it = view_trees_by_token_.find(view_tree_token_value);
   return it != view_trees_by_token_.end() ? it->second : nullptr;
 }
 
 }  // namespace view_manager