connectivity-diagnostics: add network-health component

This change adds the network health component to the connectivity
diagnostics application. This serves as a short summary of the currently
connected networks and details about them.

Bug: chromium:1142857
Change-Id: Ibfac37e10bd4badc87f234b8f0fd842667fc8a24
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2587501
Commit-Queue: Trent Begin <tbegin@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#839777}

chrome/browser/chrome_browser_interface_binders.cc

@@ -757,7 +757,7 @@ void PopulateChromeWebUIFrameBinders(
 
   RegisterWebUIControllerInterfaceBinder<
       chromeos::network_health::mojom::NetworkHealthService,
-      chromeos::NetworkUI>(map);
+      chromeos::NetworkUI, chromeos::ConnectivityDiagnosticsUI>(map);
 
   RegisterWebUIControllerInterfaceBinder<
       chromeos::network_diagnostics::mojom::NetworkDiagnosticsRoutines,

chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -226,6 +226,7 @@
 #include "chromeos/services/multidevice_setup/multidevice_setup_service.h"
 #include "chromeos/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
 #include "chromeos/services/network_health/public/mojom/network_diagnostics.mojom.h"
+#include "chromeos/services/network_health/public/mojom/network_health.mojom.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #endif
 
@@ -439,6 +440,14 @@ WebUIController* NewWebUI<chromeos::ConnectivityDiagnosticsUI>(
             chromeos::network_health::NetworkHealthService::GetInstance()
                 ->BindDiagnosticsReceiver(std::move(receiver));
           }),
+      /* BindNetworkHealthServiceCallback */
+      base::BindRepeating(
+          [](mojo::PendingReceiver<
+              chromeos::network_health::mojom::NetworkHealthService>
+                 receiver) {
+            chromeos::network_health::NetworkHealthService::GetInstance()
+                ->BindHealthReceiver(std::move(receiver));
+          }),
       /* SendFeedbackReportCallback */
       base::BindRepeating(
           &chrome::ShowFeedbackDialogForWebUI,

chromeos/components/connectivity_diagnostics/BUILD.gn

@@ -14,6 +14,7 @@ static_library("connectivity_diagnostics") {
 
   deps = [
     "../network_ui:network_diagnostics_resource_provider",
+    "../network_ui:network_health_localized_strings",
     "//chromeos/components/web_applications",
     "//chromeos/constants",
     "//chromeos/resources:connectivity_diagnostics_resources",

chromeos/components/connectivity_diagnostics/connectivity_diagnostics_ui.cc

@@ -8,9 +8,11 @@
 
 #include "chromeos/components/connectivity_diagnostics/url_constants.h"
 #include "chromeos/components/network_ui/network_diagnostics_resource_provider.h"
+#include "chromeos/components/network_ui/network_health_localized_strings.h"
 #include "chromeos/grit/connectivity_diagnostics_resources.h"
 #include "chromeos/grit/connectivity_diagnostics_resources_map.h"
 #include "chromeos/services/network_health/public/mojom/network_diagnostics.mojom.h"
+#include "chromeos/services/network_health/public/mojom/network_health.mojom.h"
 #include "chromeos/strings/grit/chromeos_strings.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui_data_source.h"
@@ -47,11 +49,17 @@ void SetUpWebUIDataSource(content::WebUIDataSource* source,
 ConnectivityDiagnosticsUI::ConnectivityDiagnosticsUI(
     content::WebUI* web_ui,
     BindNetworkDiagnosticsServiceCallback bind_network_diagnostics_callback,
+    BindNetworkHealthServiceCallback bind_network_health_callback,
     SendFeedbackReportCallback send_feedback_report_callback)
     : ui::MojoWebUIController(web_ui, /*enable_chrome_send=*/true),
       bind_network_diagnostics_service_callback_(
           std::move(bind_network_diagnostics_callback)),
+      bind_network_health_service_callback_(
+          std::move(bind_network_health_callback)),
       send_feedback_report_callback_(std::move(send_feedback_report_callback)) {
+  DCHECK(bind_network_diagnostics_service_callback_);
+  DCHECK(bind_network_health_service_callback_);
+  DCHECK(send_feedback_report_callback_);
   web_ui->RegisterMessageCallback(
       "sendFeedbackReport",
       base::BindRepeating(&ConnectivityDiagnosticsUI::SendFeedbackReportRequest,
@@ -77,6 +85,7 @@ ConnectivityDiagnosticsUI::ConnectivityDiagnosticsUI(
   source->AddLocalizedString("sendFeedbackBtn",
                              IDS_CONNECTIVITY_DIAGNOSTICS_SEND_FEEDBACK);
   network_diagnostics::AddResources(source);
+  network_health::AddLocalizedStrings(source);
 
   content::WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(),
                                 source);
@@ -87,15 +96,17 @@ ConnectivityDiagnosticsUI::~ConnectivityDiagnosticsUI() = default;
 void ConnectivityDiagnosticsUI::BindInterface(
     mojo::PendingReceiver<
         network_diagnostics::mojom::NetworkDiagnosticsRoutines> receiver) {
-  if (bind_network_diagnostics_service_callback_)
-    bind_network_diagnostics_service_callback_.Run(std::move(receiver));
+  bind_network_diagnostics_service_callback_.Run(std::move(receiver));
+}
+
+void ConnectivityDiagnosticsUI::BindInterface(
+    mojo::PendingReceiver<network_health::mojom::NetworkHealthService>
+        receiver) {
+  bind_network_health_service_callback_.Run(std::move(receiver));
 }
 
 void ConnectivityDiagnosticsUI::SendFeedbackReportRequest(
     const base::ListValue* value) {
-  if (!send_feedback_report_callback_)
-    return;
-
   std::string extra_diagnostics = "";
   auto values = value->GetList();
   if (values.size() && values[0].is_string())

chromeos/components/connectivity_diagnostics/connectivity_diagnostics_ui.h

@@ -10,6 +10,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "chromeos/services/network_health/public/mojom/network_diagnostics.mojom-forward.h"
+#include "chromeos/services/network_health/public/mojom/network_health.mojom-forward.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "ui/webui/mojo_web_ui_controller.h"
 
@@ -21,12 +22,16 @@ class ConnectivityDiagnosticsUI : public ui::MojoWebUIController {
       mojo::PendingReceiver<
           network_diagnostics::mojom::NetworkDiagnosticsRoutines>)>;
 
+  using BindNetworkHealthServiceCallback = base::RepeatingCallback<void(
+      mojo::PendingReceiver<network_health::mojom::NetworkHealthService>)>;
+
   using SendFeedbackReportCallback =
       base::RepeatingCallback<void(const std::string& extra_diagnostics)>;
 
   explicit ConnectivityDiagnosticsUI(
       content::WebUI* web_ui,
       BindNetworkDiagnosticsServiceCallback bind_network_diagnostics_callback,
+      BindNetworkHealthServiceCallback bind_network_health_callback,
       SendFeedbackReportCallback send_feeback_report_callback);
   ~ConnectivityDiagnosticsUI() override;
   ConnectivityDiagnosticsUI(const ConnectivityDiagnosticsUI&) = delete;
@@ -39,12 +44,20 @@ class ConnectivityDiagnosticsUI : public ui::MojoWebUIController {
       mojo::PendingReceiver<
           network_diagnostics::mojom::NetworkDiagnosticsRoutines> receiver);
 
+  // Instantiates implementation of the mojom::NetworkHealthService mojo
+  // interface passing the pending receiver that will be bound.
+  void BindInterface(
+      mojo::PendingReceiver<network_health::mojom::NetworkHealthService>
+          receiver);
+
   void SendFeedbackReportRequest(const base::ListValue* value);
 
  private:
   const BindNetworkDiagnosticsServiceCallback
       bind_network_diagnostics_service_callback_;
 
+  const BindNetworkHealthServiceCallback bind_network_health_service_callback_;
+
   const SendFeedbackReportCallback send_feedback_report_callback_;
 
   base::WeakPtrFactory<ConnectivityDiagnosticsUI> weak_factory_{this};

chromeos/components/connectivity_diagnostics/resources/BUILD.gn

@@ -20,6 +20,8 @@ js_library("connectivity_diagnostics") {
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_components/chromeos/network_health:network_diagnostics.m",
     "//ui/webui/resources/cr_components/chromeos/network_health:network_diagnostics_mojo.m",
+    "//ui/webui/resources/cr_components/chromeos/network_health:network_health_summary.m",
+    "//ui/webui/resources/cr_components/chromeos/network_health:network_health_mojo.m",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
 

chromeos/components/connectivity_diagnostics/resources/connectivity_diagnostics.html

@@ -31,6 +31,7 @@
 <div class="app">
   <h1 id="appTitle">[[i18n('appTitle')]]</h1>
   <div class="content">
+    <network-health-summary id="network-health"></network-health-summary>
     <network-diagnostics id="network-diagnostics"></network-diagnostics>
   </div>
   <div class="button-group">

chromeos/components/connectivity_diagnostics/resources/connectivity_diagnostics.js

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'chrome://resources/cr_components/chromeos/network_health/network_diagnostics.m.js';
+import 'chrome://resources/cr_components/chromeos/network_health/network_health_summary.m.js';
 import 'chrome://resources/cr_elements/shared_style_css.m.js';
 import './strings.m.js';
 

ui/webui/resources/cr_components/BUILD.gn

@@ -155,6 +155,8 @@ preprocess_if_expr("preprocess_generated") {
       "chromeos/cellular_setup/setup_loading_page.m.js",
       "chromeos/cellular_setup/subflow_behavior.m.js",
       "chromeos/cellular_setup/webview_post_util.m.js",
+      "chromeos/network_health/network_health_summary.m.js",
+      "chromeos/network_health/network_health_mojo.m.js",
       "chromeos/network_health/network_diagnostics.m.js",
       "chromeos/network_health/network_diagnostics_mojo.m.js",
       "chromeos/network_health/network_diagnostics_types.m.js",
@@ -316,6 +318,8 @@ preprocess_if_expr("preprocess_polymer2") {
       "chromeos/network_health/network_diagnostics_types.js",
       "chromeos/network_health/network_health_summary.html",
       "chromeos/network_health/network_health_summary.js",
+      "chromeos/network_health/network_health_mojo.html",
+      "chromeos/network_health/network_health_mojo.js",
       "chromeos/network_health/routine_group.html",
       "chromeos/network_health/routine_group.js",
       "chromeos/network/mojo_interface_provider.html",

ui/webui/resources/cr_components/chromeos/network_health/BUILD.gn

@@ -15,6 +15,7 @@ js_type_check("closure_compile") {
     ":network_diagnostics",
     ":network_diagnostics_mojo",
     ":network_diagnostics_types",
+    ":network_health_mojo",
     ":network_health_summary",
     ":routine_group",
   ]
@@ -26,6 +27,7 @@ js_type_check("closure_compile_module") {
     ":network_diagnostics.m",
     ":network_diagnostics_mojo.m",
     ":network_diagnostics_types.m",
+    ":network_health_mojo.m",
     ":network_health_summary.m",
     ":routine_group.m",
   ]
@@ -35,12 +37,20 @@ js_type_check("closure_compile_module") {
 
 js_library("network_health_summary") {
   deps = [
-    "//chromeos/services/network_health/public/mojom:mojom_js_library_for_compile",
+    ":network_health_mojo",
     "//ui/webui/resources/cr_components/chromeos/network:onc_mojo",
     "//ui/webui/resources/js:i18n_behavior",
   ]
 }
 
+js_library("network_health_mojo") {
+  deps = [
+    "//chromeos/services/network_config/public/mojom:mojom_js_library_for_compile",
+    "//chromeos/services/network_health/public/mojom:mojom_js_library_for_compile",
+    "//ui/webui/resources/js:cr",
+  ]
+}
+
 js_library("network_diagnostics") {
   deps = [
     ":network_diagnostics_mojo",
@@ -72,7 +82,7 @@ js_library("routine_group") {
 js_library("network_health_summary.m") {
   sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/network_health/network_health_summary.m.js" ]
   deps = [
-    "//chromeos/services/network_health/public/mojom:mojom_js_library_for_compile",
+    ":network_health_mojo.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_components/chromeos/network:onc_mojo",
     "//ui/webui/resources/js:i18n_behavior.m",
@@ -80,6 +90,12 @@ js_library("network_health_summary.m") {
   extra_deps = [ ":network_health_summary_module" ]
 }
 
+js_library("network_health_mojo.m") {
+  sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/network_health/network_health_mojo.m.js" ]
+  deps = [ "//chromeos/services/network_health/public/mojom:mojom_js_library_for_compile" ]
+  extra_deps = [ ":modulize" ]
+}
+
 js_library("network_diagnostics.m") {
   sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/network_health/network_diagnostics.m.js" ]
   deps = [
@@ -123,6 +139,9 @@ polymer_modulizer("network_health_summary") {
   js_file = "network_health_summary.js"
   html_file = "network_health_summary.html"
   html_type = "dom-module"
+  auto_imports = [
+    "ui/webui/resources/cr_components/chromeos/network/onc_mojo.html|OncMojo",
+  ]
 }
 
 polymer_modulizer("network_diagnostics") {
@@ -141,6 +160,7 @@ polymer_modulizer("routine_group") {
 
 js_modulizer("modulize") {
   input_files = [
+    "network_health_mojo.js",
     "network_diagnostics_mojo.js",
     "network_diagnostics_types.js",
   ]

ui/webui/resources/cr_components/chromeos/network_health/network_health_mojo.html

+<link rel="import" href="chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.html">
+
+<script src="chrome://resources/mojo/chromeos/services/network_health/public/mojom/network_health.mojom-lite.js"></script>
+<script src="network_health_mojo.js"></script>

ui/webui/resources/cr_components/chromeos/network_health/network_health_mojo.js

+// Copyright 2020 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.
+
+// clang-format off
+// #import 'chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.js';
+// #import 'chrome://resources/mojo/chromeos/services/network_config/public/mojom/network_types.mojom-lite.js';
+// #import 'chrome://resources/mojo/chromeos/services/network_health/public/mojom/network_health.mojom-lite.js';
+// clang-format on
+
+/**
+ * @fileoverview Wrapper around Network Health mojom file and associated
+ * utilities.
+ * TODO(crbug/1111852): Remove this wrapper once Polymer2 no longer needs to be
+ * supported. These imports can be used directly.
+ */

ui/webui/resources/cr_components/chromeos/network_health/network_health_summary.html

 <link rel="import" href="../../../html/polymer.html">
 
-<link rel="import" href="chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.html">
-<link rel="import" href="chrome://resources/mojo/chromeos/services/network_health/public/mojom/network_health.mojom.html">
 <link rel="import" href="../../../cr_elements/shared_style_css.html">
 <link rel="import" href="../../../html/i18n_behavior.html">
+<link rel="import" href="../network/onc_mojo.html">
+<link rel="import" href="network_health_mojo.html">
 
 
 <dom-module id="network-health-summary">