Create a RegisterViewAssociate method in ViewManager

services/ui/view_manager/view_associate_table.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_associate_table.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 15 matching lines @@
 void ViewAssociateTable::ConnectAssociates(
     mojo::ApplicationImpl* app_impl,
     mojo::ui::ViewInspector* inspector,
     const std::vector<std::string>& urls,
     const AssociateConnectionErrorCallback& connection_error_callback) {
   DCHECK(app_impl);
   DCHECK(inspector);
 
   for (auto& url : urls) {
     DVLOG(1) << "Connecting to view associate: url=" << url;
-    associates_.emplace_back(new AssociateData(url, inspector));
-    AssociateData* data = associates_.back().get();
 
-    mojo::ConnectToService(app_impl->shell(), url, GetProxy(&data->associate));
-    data->associate.set_connection_error_handler(
-        base::Bind(connection_error_callback, url));
+    mojo::ui::ViewAssociatePtr associate;
+    mojo::ConnectToService(app_impl->shell(), url, GetProxy(&associate));
 
-    mojo::ui::ViewInspectorPtr inspector;
-    data->inspector_binding.Bind(GetProxy(&inspector));
-    data->associate->Connect(
-        inspector.Pass(),
-        base::Bind(&ViewAssociateTable::OnConnected, base::Unretained(this),
-                   pending_connection_count_));
-
-    pending_connection_count_++;
+    // Wire up the associate to us
+    RegisterViewAssociate(inspector, associate.Pass(),
+                          connection_error_callback);
   }
 }
 
+void ViewAssociateTable::RegisterViewAssociate(
+    mojo::ui::ViewInspector* inspector,
+    mojo::ui::ViewAssociatePtr associate,
+    const AssociateConnectionErrorCallback& connection_error_callback) {
+  DCHECK(inspector);
+  DCHECK(associate.is_bound());
+
+  associates_.emplace_back(new AssociateData(associate.Pass(), inspector));

[jeffbrown, 2016/05/11 23:44:19]

for debugging, it might be useful if each associate had a label (like the View
and ViewTree labels)

[mikejurka, 2016/05/16 23:35:18]

how would we get/generate the label? should it be passed in with
RegisterViewAssociate? I was passing in a "url" before, that could be a label
instead.

+  AssociateData* data = associates_.back().get();
+
+  if (connection_error_callback.is_null()) {

[jeffbrown, 2016/05/11 23:44:20]

I think this check is going to go away when we move the code that connects to
associates out of ViewManager and into Launcher.  Do you want to do that in this
patch or as a follow-up?

[mikejurka, 2016/05/16 23:35:18]

follow-up since the existing code should still work for now

+    // set it to use our error handler
+    data->associate.set_connection_error_handler(
+        base::Bind(&ViewAssociateTable::OnAssociateConnectionError,
+                   base::Unretained(this), data));
+  }
+
+  // connect the associate to our view inspector

[jeffbrown, 2016/05/11 23:44:19]

style nit: Treat comments as complete sentences.

https://google.github.io/styleguide/cppguide.html#Punctuation,_Spelling_and_G...

[mikejurka, 2016/05/16 23:35:18]

Done.

+  mojo::ui::ViewInspectorPtr inspector_ptr;
+  data->inspector_binding.Bind(GetProxy(&inspector_ptr));
+  data->associate->Connect(
+      inspector_ptr.Pass(),
+      base::Bind(&ViewAssociateTable::OnConnected, base::Unretained(this),
+                 pending_connection_count_));
+
+  // wait for the associate to connect to our view inspector

[jeffbrown, 2016/05/11 23:44:16]

Technically we're waiting for it to give us back its AssociateInfo in response
to the call to Connect.  It might not do anything with the ViewInspector (could
even throw it away if it doesn't need it).

+  pending_connection_count_++;
+}
+
 void ViewAssociateTable::ConnectToViewService(
     mojo::ui::ViewTokenPtr view_token,
     const mojo::String& service_name,
     mojo::ScopedMessagePipeHandle client_handle) {
   if (pending_connection_count_) {
     deferred_work_.push_back(
         base::Bind(&ViewAssociateTable::ConnectToViewService,
                    base::Unretained(this), base::Passed(view_token.Pass()),
                    service_name, base::Passed(client_handle.Pass())));
     return;
   }
 
   for (auto& data : associates_) {
     DCHECK(data->info);
     if (Contains(data->info->view_service_names, service_name)) {
       DVLOG(2) << "Connecting to view service: view_token=" << view_token
-               << ", service_name=" << service_name
-               << ", associate_url=" << data->url;
+               << ", service_name=" << service_name;
       DCHECK(data->associate);
       data->associate->ConnectToViewService(view_token.Pass(), service_name,
                                             client_handle.Pass());
+
       return;
     }
   }
 
   DVLOG(2) << "Requested view service not available: view_token=" << view_token
            << ", service_name=" << service_name;
   // Allow pipe to be closed as an indication of failure.
 }
 
+void ViewAssociateTable::OnAssociateConnectionError(
+    AssociateData* associate_data) {
+  // Remove associate from our list
+  for (auto it = associates_.begin(); it != associates_.end(); it++) {
+    AssociateData* data = it->get();
+    if (associate_data == data) {
+      DVLOG(2) << "ViewAssociate disconnected, removing from table";
+      associates_.erase(it);
+      break;
+    }
+  }
+}
+
 void ViewAssociateTable::ConnectToViewTreeService(
     mojo::ui::ViewTreeTokenPtr view_tree_token,
     const mojo::String& service_name,
     mojo::ScopedMessagePipeHandle client_handle) {
   if (pending_connection_count_) {
     deferred_work_.push_back(
         base::Bind(&ViewAssociateTable::ConnectToViewTreeService,
                    base::Unretained(this), base::Passed(view_tree_token.Pass()),
                    service_name, base::Passed(client_handle.Pass())));
     return;
   }
 
   for (auto& data : associates_) {
     DCHECK(data->info);
     if (Contains(data->info->view_tree_service_names, service_name)) {
       DVLOG(2) << "Connecting to view tree service: view_tree_token="
-               << view_tree_token << ", service_name=" << service_name
-               << ", associate_url=" << data->url;

[jeffbrown, 2016/05/11 23:44:20]

Yeah, it would be really useful to be able to print a label here.  I guess
everywhere you saw url before you could replace with label.

+               << view_tree_token << ", service_name=" << service_name;
       DCHECK(data->associate);
       data->associate->ConnectToViewTreeService(
           view_tree_token.Pass(), service_name, client_handle.Pass());
       return;
     }
   }
 
   DVLOG(2) << "Requested view tree service not available: view_tree_token="
            << view_tree_token << ", service_name=" << service_name;
   // Allow pipe to be closed as an indication of failure.
 }
 
 void ViewAssociateTable::OnConnected(uint32_t index,
                                      mojo::ui::ViewAssociateInfoPtr info) {
   DCHECK(info);
   DCHECK(pending_connection_count_);
   DCHECK(!associates_[index]->info);
 
-  DVLOG(1) << "Connected to view associate: url=" << associates_[index]->url
-           << ", info=" << info;
+  DVLOG(1) << "Connected to view associate, info=" << info;
   associates_[index]->info = info.Pass();
 
   pending_connection_count_--;
   if (!pending_connection_count_)
     CompleteDeferredWork();
 }
 
 void ViewAssociateTable::CompleteDeferredWork() {
   DCHECK(!pending_connection_count_);
 
   for (auto& work : deferred_work_)
     work.Run();
   deferred_work_.clear();
 }
 
 ViewAssociateTable::AssociateData::AssociateData(
-    const std::string& url,
+    mojo::ui::ViewAssociatePtr associate,
     mojo::ui::ViewInspector* inspector)
-    : url(url), inspector_binding(inspector) {}
+    : associate(associate.Pass()), inspector_binding(inspector) {}
 
 ViewAssociateTable::AssociateData::~AssociateData() {}
 
 }  // namespace view_manager