Navi: Get list of Google apps from browser.

Bug: 889222
Change-Id: I666bb92178d2e5236143656f9b96180df8fd133c
Reviewed-on: https://chromium-review.googlesource.com/c/1266202
Commit-Queue: Hector Carmona <hcarmona@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599834}

chrome/browser/resources/welcome/onboarding_welcome/email/BUILD.gn

@@ -12,13 +12,16 @@ js_type_check("closure_compile") {
 }
 
 js_library("nux_email") {
-  deps = []
+  deps = [
+    "../shared:nux_types",
+  ]
 }
 
 js_library("email_chooser") {
   deps = [
     ":nux_email_proxy",
     "//third_party/polymer/v1_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer-extracted",
+    "//ui/webui/resources/js:cr",
     "//ui/webui/resources/js:i18n_behavior",
   ]
 }

chrome/browser/resources/welcome/onboarding_welcome/email/email_chooser.html

@@ -3,6 +3,7 @@
 <link rel="import" href="chrome://resources/cr_elements/icons.html">
 <link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
 <link rel="import" href="chrome://resources/cr_elements/paper_button_style_css.html">
+<link rel="import" href="chrome://resources/html/cr.html">
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-announcer/iron-a11y-announcer.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
@@ -45,7 +46,7 @@
       }
     </style>
 
-    <template is="dom-repeat" items="[[emailList]]">
+    <template is="dom-repeat" items="[[emailList_]]">
       <button active$="[[getSelected_(item, selectedEmailProvider_)]]"
           on-click="onEmailClick_" on-pointerdown="onEmailPointerDown_"
           on-keyup="onEmailKeyUp_" class="option">

chrome/browser/resources/welcome/onboarding_welcome/email/email_chooser.js

@@ -2,17 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/**
- * @const
- */
-var nuxEmail = nuxEmail || {};
+cr.exportPath('nuxEmail');
 
 /**
- * @typedef {?{
- *    name: string,
- *    icon: string,
- *    url: string,
- *    bookmarkId: (string|undefined),
+ * @typedef {{
+ *   id: number,
+ *   name: string,
+ *   icon: string,
+ *   url: string,
+ *   bookmarkId: (string|undefined),
  * }}
  */
 nuxEmail.EmailProviderModel;
@@ -23,7 +21,11 @@ Polymer({
   behaviors: [I18nBehavior],
 
   properties: {
-    emailList: Array,
+    /**
+     * @type {!Array<!nux.BookmarkListItem>}
+     * @private
+     */
+    emailList_: Array,
 
     /** @private */
     bookmarkBarWasShown_: {
@@ -34,7 +36,7 @@ Polymer({
     /** @private */
     finalized_: Boolean,
 
-    /** @private {nuxEmail.EmailProviderModel} */
+    /** @private {?nuxEmail.EmailProviderModel} */
     selectedEmailProvider_: {
       type: Object,
       value: () => null,
@@ -57,7 +59,9 @@ Polymer({
     this.browserProxy_ = nux.NuxEmailProxyImpl.getInstance();
     this.browserProxy_.recordPageInitialized();
 
-    this.emailList = this.browserProxy_.getEmailList();
+    this.browserProxy_.getEmailList().then(list => {
+      this.emailList_ = list;
+    });
 
     window.addEventListener('beforeunload', () => {
       // Only need to clean up if user didn't interact with the buttons.
@@ -110,11 +114,11 @@ Polymer({
   },
 
   /**
-   * @param {nuxEmail.EmailProviderModel=} emailProvider
+   * @param {nuxEmail.EmailProviderModel=} opt_emailProvider
    * @private
    */
-  revertBookmark_: function(emailProvider) {
-    emailProvider = emailProvider || this.selectedEmailProvider_;
+  revertBookmark_: function(opt_emailProvider) {
+    let emailProvider = opt_emailProvider || this.selectedEmailProvider_;
 
     if (emailProvider && emailProvider.bookmarkId)
       this.browserProxy_.removeBookmark(emailProvider.bookmarkId);
@@ -182,4 +186,4 @@ Polymer({
     if (this.$$('.action-button').disabled)
       this.browserProxy_.recordClickedDisabledButton();
   },
-});
+});
\ No newline at end of file

chrome/browser/resources/welcome/onboarding_welcome/email/nux_email_proxy.html

 <link rel="import" href="chrome://resources/html/cr.html">
-<link rel="import" href="../shared/i18n_setup.html">
+<link rel="import" href="chrome://welcome/shared/i18n_setup.html">
 <script src="nux_email_proxy.js"></script>
\ No newline at end of file

chrome/browser/resources/welcome/onboarding_welcome/email/nux_email_proxy.js

@@ -61,7 +61,10 @@ cr.define('nux', function() {
     /** @param {boolean} show */
     toggleBookmarkBar(show) {}
 
-    /** @return {!Array<Object>} Array of email providers. */
+    /**
+     * Returns a promise for an array of email providers.
+     * @return {!Promise<!Array<!nux.BookmarkListItem>>}
+     */
     getEmailList() {}
 
     recordPageInitialized() {}
@@ -111,17 +114,7 @@ cr.define('nux', function() {
 
     /** @override */
     getEmailList() {
-      let emailCount = loadTimeData.getInteger('email_count');
-      let emailList = [];
-      for (let i = 0; i < emailCount; ++i) {
-        emailList.push({
-          id: loadTimeData.getValue(`email_id_${i}`),
-          name: loadTimeData.getString(`email_name_${i}`),
-          icon: loadTimeData.getString(`email_name_${i}`).toLowerCase(),
-          url: loadTimeData.getString(`email_url_${i}`)
-        });
-      }
-      return emailList;
+      return cr.sendWithPromise('getEmailList');
     }
 
     /** @override */

chrome/browser/resources/welcome/onboarding_welcome/google_apps/BUILD.gn

@@ -12,13 +12,16 @@ js_type_check("closure_compile") {
 }
 
 js_library("apps_chooser") {
-  deps = []
+  deps = [
+    "//ui/webui/resources/js:cr",
+  ]
 }
 
 js_library("nux_google_apps") {
   deps = [
     ":apps_chooser",
     ":nux_google_apps_proxy",
+    "../shared:nux_types",
   ]
 }
 

chrome/browser/resources/welcome/onboarding_welcome/google_apps/apps_chooser.html

@@ -2,8 +2,10 @@
 
 <link rel="import" href="chrome://resources/cr_elements/icons.html">
 <link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
+<link rel="import" href="chrome://resources/html/cr.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
+<link rel="import" href="chrome://welcome/apps/nux_google_apps_proxy.html">
 <link rel="import" href="chrome://welcome/shared/chooser_shared_css.html">
 
 <dom-module id="apps-chooser">
@@ -39,14 +41,14 @@
             url(chrome://welcome/apps/news_2x.png) 2x);
       }
 
-      .chrome-store {
+      .web-store {
         content: -webkit-image-set(
             url(chrome://welcome/apps/chrome_store_1x.png) 1x,
             url(chrome://welcome/apps/chrome_store_2x.png) 2x);
       }
     </style>
 
-    <template is="dom-repeat" items="[[appList]]">
+    <template is="dom-repeat" items="[[appList_]]">
       <button active$="[[item.selected]]"
           on-click="onAppClick_" on-pointerdown="onAppPointerDown_"
           on-keyup="onAppKeyUp_" class="option">
@@ -59,4 +61,4 @@
     </template>
   </template>
   <script src="apps_chooser.js"></script>
-</dom-module>
+</dom-module>
\ No newline at end of file

chrome/browser/resources/welcome/onboarding_welcome/google_apps/apps_chooser.js

@@ -2,64 +2,35 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+cr.exportPath('nuxGoogleApps');
+
 /**
- * @const
+ * @typedef {{
+ *   id: number,
+ *   name: string,
+ *   icon: string,
+ *   url: string,
+ *   selected: boolean,
+ * }}
  */
-var nuxGoogleApps = nuxGoogleApps || {};
+nuxGoogleApps.AppItem;
 
 /**
  * @typedef {{
- *   item: !{
- *     name: string,
- *     icon: string,
- *     selected: boolean,
- *   },
+ *   item: !nuxGoogleApps.AppItem,
  *   set: function(string, boolean):void
  * }}
  */
-nuxGoogleApps.AppsArrayModel;
+nuxGoogleApps.AppItemModel;
 
 Polymer({
   is: 'apps-chooser',
   properties: {
-    // TODO(hcarmona): Get this list dynamically.
-    appList: {
-      type: Array,
-      value: function() {
-        return [
-          {
-            name: 'Gmail',
-            icon: 'gmail',
-            selected: true,
-          },
-          {
-            name: 'YouTube',
-            icon: 'youtube',
-            selected: true,
-          },
-          {
-            name: 'Maps',
-            icon: 'maps',
-            selected: true,
-          },
-          {
-            name: 'Translate',
-            icon: 'translate',
-            selected: true,
-          },
-          {
-            name: 'News',
-            icon: 'news',
-            selected: true,
-          },
-          {
-            name: 'Web Store',
-            icon: 'chrome-store',
-            selected: true,
-          },
-        ];
-      },
-    },
+    /**
+     * @type {!Array<!nuxGoogleApps.AppItem>}
+     * @private
+     */
+    appList_: Array,
 
     hasAppsSelected: {
       type: Boolean,
@@ -68,17 +39,27 @@ Polymer({
     }
   },
 
+  /** @override */
+  ready() {
+    nux.NuxGoogleAppsProxyImpl.getInstance().getGoogleAppsList().then(list => {
+      this.appList_ = list.map(app => {
+        app.selected = true;  // default all items selected.
+        return app;
+      });
+    });
+  },
+
   /**
    * Returns an array of booleans for each selected app.
-   * @return {Array<boolean>}
+   * @return {!Array<boolean>}
    */
   getSelectedAppList() {
-    return this.appList.map(a => a.selected);
+    return this.appList_.map(a => a.selected);
   },
 
   /**
    * Handle toggling the apps selected.
-   * @param {!{model: !nuxGoogleApps.AppsArrayModel}} e
+   * @param {!{model: !nuxGoogleApps.AppItemModel}} e
    * @private
    */
   onAppClick_: function(e) {
@@ -107,6 +88,6 @@ Polymer({
    * @private
    */
   computeHasAppsSelected_: function() {
-    return this.appList.some(a => a.selected);
+    return this.appList_.some(a => a.selected);
   },
 });

chrome/browser/resources/welcome/onboarding_welcome/google_apps/nux_google_apps_proxy.html

 <link rel="import" href="chrome://resources/html/cr.html">
+<link rel="import" href="chrome://welcome/shared/i18n_setup.html">
 <script src="nux_google_apps_proxy.js"></script>
\ No newline at end of file

chrome/browser/resources/welcome/onboarding_welcome/google_apps/nux_google_apps_proxy.js

@@ -10,6 +10,12 @@ cr.define('nux', function() {
      * @param {!Array<boolean>} selectedApps
      */
     addGoogleApps(selectedApps) {}
+
+    /**
+     * Returns a promise for an array of Google apps.
+     * @return {!Promise<!Array<!nux.BookmarkListItem>>}
+     */
+    getGoogleAppsList() {}
   }
 
   /** @implements {nux.NuxGoogleAppsProxy} */
@@ -18,6 +24,11 @@ cr.define('nux', function() {
     addGoogleApps(selectedApps) {
       chrome.send('addGoogleApps', selectedApps);
     }
+
+    /** @override */
+    getGoogleAppsList() {
+      return cr.sendWithPromise('getGoogleAppsList');
+    }
   }
 
   cr.addSingletonGetter(NuxGoogleAppsProxyImpl);

chrome/browser/resources/welcome/onboarding_welcome/shared/BUILD.gn

+# Copyright 2018 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.
+
+import("//third_party/closure_compiler/compile_js.gni")
+
+js_type_check("closure_compile") {
+  deps = [
+    ":nux_types",
+  ]
+}
+
+js_library("nux_types") {
+  deps = [
+    "//ui/webui/resources/js:cr",
+  ]
+}

chrome/browser/resources/welcome/onboarding_welcome/shared/nux_types.js

+// Copyright 2018 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.
+
+cr.exportPath('nux');
+
+/**
+ * @typedef {{
+ *   id: number,
+ *   name: string,
+ *   icon: string,
+ *   url: string,
+ * }}
+ */
+nux.BookmarkListItem;
\ No newline at end of file

chrome/browser/ui/webui/welcome/nux/BUILD.gn

@@ -15,6 +15,18 @@ source_set("constants") {
   ]
 }
 
+static_library("bookmark_item") {
+  sources = [
+    "bookmark_item.cc",
+    "bookmark_item.h",
+  ]
+
+  deps = [
+    "//base",
+    "//content/public/browser",
+  ]
+}
+
 static_library("email_feature") {
   sources = [
     "email_handler.cc",
@@ -28,6 +40,7 @@ static_library("email_feature") {
   ]
 
   deps = [
+    ":bookmark_item",
     "//chrome/app:generated_resources",
     "//chrome/browser:resources",
     "//components/bookmarks/browser",
@@ -56,6 +69,7 @@ static_library("google_apps_feature") {
   ]
 
   deps = [
+    ":bookmark_item",
     "//chrome/app:generated_resources",
     "//chrome/browser:resources",
     "//components/bookmarks/browser",

chrome/browser/ui/webui/welcome/nux/bookmark_item.cc

+// Copyright 2018 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 "chrome/browser/ui/webui/welcome/nux/bookmark_item.h"
+
+#include "base/strings/string16.h"
+#include "base/values.h"
+
+namespace nux {
+
+base::ListValue bookmarkItemsToListValue(const BookmarkItem items[],
+                                         size_t count) {
+  base::ListValue list_value;
+  for (size_t i = 0; i < count; ++i) {
+    std::unique_ptr<base::DictionaryValue> element =
+        std::make_unique<base::DictionaryValue>();
+
+    element->SetInteger("id", static_cast<int>(items[i].id));
+    element->SetString("name", items[i].name);
+    element->SetString("icon", items[i].webui_icon);
+    element->SetString("url", items[i].url);
+
+    list_value.Append(std::move(element));
+  }
+  return list_value;
+}
+
+}  // namespace nux

chrome/browser/ui/webui/welcome/nux/bookmark_item.h

+// Copyright 2018 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 CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_BOOKMARK_ITEM_H_
+#define CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_BOOKMARK_ITEM_H_
+
+#include <stddef.h>
+
+namespace base {
+class ListValue;
+}  // namespace base
+
+namespace nux {
+
+struct BookmarkItem {
+  const int id;
+  const char* name;
+  const char* webui_icon;
+  const char* url;
+  const int icon;  // Corresponds with resource ID, used for bookmark cache.
+};
+
+base::ListValue bookmarkItemsToListValue(const BookmarkItem items[],
+                                         size_t count);
+
+}  // namespace nux
+
+#endif  // CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_BOOKMARK_ITEM_H_

chrome/browser/ui/webui/welcome/nux/email_handler.cc

@@ -9,6 +9,7 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/ui/webui/welcome/nux/bookmark_item.h"
 #include "chrome/grit/browser_resources.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/bookmarks/common/bookmark_pref_names.h"
@@ -35,29 +36,22 @@ enum class EmailProviders {
   kCount,
 };
 
-struct EmailProviderType {
-  const EmailProviders id;
-  const char* name;  // Icon in WebUI should use name to match CSS.
-  const char* url;
-  const int icon;  // Corresponds with resource ID, used for bookmark cache.
-};
-
 const char* kEmailInteractionHistogram =
     "FirstRun.NewUserExperience.EmailInteraction";
 
 // Strings in costants not translated because this is an experiment.
 // Translate before wide release.
-// TODO(hcarmona): populate with icon ids.
-const EmailProviderType kEmail[] = {
-    {EmailProviders::kGmail, "Gmail",
+const BookmarkItem kEmail[] = {
+    {static_cast<int>(EmailProviders::kGmail), "Gmail", "gmail",
      "https://accounts.google.com/b/0/AddMailService", IDR_NUX_EMAIL_GMAIL_1X},
-    {EmailProviders::kYahoo, "Yahoo", "https://mail.yahoo.com",
-     IDR_NUX_EMAIL_YAHOO_1X},
-    {EmailProviders::kOutlook, "Outlook", "https://login.live.com/login.srf?",
-     IDR_NUX_EMAIL_OUTLOOK_1X},
-    {EmailProviders::kAol, "AOL", "https://mail.aol.com", IDR_NUX_EMAIL_AOL_1X},
-    {EmailProviders::kiCloud, "iCloud", "https://www.icloud.com/mail",
-     IDR_NUX_EMAIL_ICLOUD_1X},
+    {static_cast<int>(EmailProviders::kYahoo), "Yahoo", "yahoo",
+     "https://mail.yahoo.com", IDR_NUX_EMAIL_YAHOO_1X},
+    {static_cast<int>(EmailProviders::kOutlook), "Outlook", "outlook",
+     "https://login.live.com/login.srf?", IDR_NUX_EMAIL_OUTLOOK_1X},
+    {static_cast<int>(EmailProviders::kAol), "AOL", "aol",
+     "https://mail.aol.com", IDR_NUX_EMAIL_AOL_1X},
+    {static_cast<int>(EmailProviders::kiCloud), "iCloud", "icloud",
+     "https://www.icloud.com/mail", IDR_NUX_EMAIL_ICLOUD_1X},
 };
 
 constexpr const int kEmailIconSize = 48;  // Pixels.
@@ -80,15 +74,18 @@ void EmailHandler::RegisterMessages() {
       "toggleBookmarkBar",
       base::BindRepeating(&EmailHandler::HandleToggleBookmarkBar,
                           base::Unretained(this)));
+  web_ui()->RegisterMessageCallback(
+      "getEmailList", base::BindRepeating(&EmailHandler::HandleGetEmailList,
+                                          base::Unretained(this)));
 }
 
 void EmailHandler::HandleCacheEmailIcon(const base::ListValue* args) {
   int emailId;
   args->GetInteger(0, &emailId);
 
-  const EmailProviderType* selectedEmail = NULL;
+  const BookmarkItem* selectedEmail = NULL;
   for (size_t i = 0; i < base::size(kEmail); i++) {
-    if ((int)kEmail[i].id == emailId) {
+    if (static_cast<int>(kEmail[i].id) == emailId) {
       selectedEmail = &kEmail[i];
       break;
     }
@@ -112,6 +109,15 @@ void EmailHandler::HandleToggleBookmarkBar(const base::ListValue* args) {
   prefs_->SetBoolean(bookmarks::prefs::kShowBookmarkBar, show);
 }
 
+void EmailHandler::HandleGetEmailList(const base::ListValue* args) {
+  AllowJavascript();
+  CHECK_EQ(1U, args->GetSize());
+  const base::Value* callback_id;
+  CHECK(args->Get(0, &callback_id));
+  ResolveJavascriptCallback(
+      *callback_id, bookmarkItemsToListValue(kEmail, base::size(kEmail)));
+}
+
 void EmailHandler::AddSources(content::WebUIDataSource* html_source,
                               PrefService* prefs) {
   // Localized strings.
@@ -155,12 +161,6 @@ void EmailHandler::AddSources(content::WebUIDataSource* html_source,
   html_source->AddResourcePath("email/yahoo_2x.png", IDR_NUX_EMAIL_YAHOO_2X);
 
   // Add constants to loadtime data
-  for (size_t i = 0; i < (size_t)EmailProviders::kCount; ++i) {
-    html_source->AddInteger("email_id_" + std::to_string(i), (int)kEmail[i].id);
-    html_source->AddString("email_name_" + std::to_string(i), kEmail[i].name);
-    html_source->AddString("email_url_" + std::to_string(i), kEmail[i].url);
-  }
-  html_source->AddInteger("email_count", (int)EmailProviders::kCount);
   html_source->AddBoolean(
       "bookmark_bar_shown",
       prefs->GetBoolean(bookmarks::prefs::kShowBookmarkBar));

chrome/browser/ui/webui/welcome/nux/email_handler.h

@@ -43,6 +43,7 @@ class EmailHandler : public content::WebUIMessageHandler {
   // Callbacks for JS APIs.
   void HandleCacheEmailIcon(const base::ListValue* args);
   void HandleToggleBookmarkBar(const base::ListValue* args);
+  void HandleGetEmailList(const base::ListValue* args);
 
   // Adds webui sources.
   static void AddSources(content::WebUIDataSource* html_source,

chrome/browser/ui/webui/welcome/nux/google_apps_handler.cc

@@ -8,6 +8,7 @@
 #include "base/metrics/field_trial_params.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/stl_util.h"
+#include "chrome/browser/ui/webui/welcome/nux/bookmark_item.h"
 #include "chrome/grit/browser_resources.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/bookmarks/common/bookmark_pref_names.h"
@@ -26,7 +27,7 @@ namespace nux {
 // These values are persisted to logs. Entries should not be renumbered and
 // numeric values should never be reused.
 enum class GoogleApps {
-  kGmail = 0,
+  kGmailDoNotUse = 0,  // Deprecated.
   kYouTube = 1,
   kMaps = 2,
   kTranslate = 3,
@@ -39,31 +40,21 @@ const char* kGoogleAppsInteractionHistogram =
     "FirstRun.NewUserExperience.GoogleAppsInteraction";
 
 // Strings in costants not translated because this is an experiment.
-// Translate before wide release.
-
-constexpr const char* kGoogleAppNames[] = {
-    "Gmail", "YouTube", "Maps", "Translate", "News", "Chrome Web Store",
-};
-
-constexpr const char* kGoogleAppUrls[] = {
-    "https://gmail.com",       "https://youtube.com",
-    "https://maps.google.com", "https://translate.google.com",
-    "https://news.google.com", "https://chrome.google.com/webstore",
+// TODO(hcarmona): Translate before wide release.
+const BookmarkItem kGoogleApps[] = {
+    {static_cast<int>(GoogleApps::kYouTube), "YouTube", "youtube",
+     "https://youtube.com", IDR_NUX_GOOGLE_APPS_YOUTUBE_1X},
+    {static_cast<int>(GoogleApps::kMaps), "Maps", "maps",
+     "https://maps.google.com", IDR_NUX_GOOGLE_APPS_MAPS_1X},
+    {static_cast<int>(GoogleApps::kTranslate), "Translate", "translate",
+     "https://translate.google.com", IDR_NUX_GOOGLE_APPS_TRANSLATE_1X},
+    {static_cast<int>(GoogleApps::kNews), "News", "news",
+     "https://news.google.com", IDR_NUX_GOOGLE_APPS_NEWS_1X},
+    {static_cast<int>(GoogleApps::kChromeWebStore), "Web Store", "web-store",
+     "https://chrome.google.com/webstore", IDR_NUX_GOOGLE_APPS_CHROME_STORE_1X},
 };
 
 constexpr const int kGoogleAppIconSize = 48;  // Pixels.
-constexpr const int kGoogleAppIcons[] = {
-    IDR_NUX_EMAIL_GMAIL_1X, IDR_NUX_GOOGLE_APPS_YOUTUBE_1X,
-    IDR_NUX_GOOGLE_APPS_MAPS_1X,  IDR_NUX_GOOGLE_APPS_TRANSLATE_1X,
-    IDR_NUX_GOOGLE_APPS_NEWS_1X,  IDR_NUX_GOOGLE_APPS_CHROME_STORE_1X,
-};
-
-static_assert(base::size(kGoogleAppNames) == base::size(kGoogleAppUrls),
-              "names and urls must match");
-static_assert(base::size(kGoogleAppNames) == (size_t)GoogleApps::kCount,
-              "names and histograms must match");
-static_assert(base::size(kGoogleAppNames) == base::size(kGoogleAppIcons),
-              "names and icons must match");
 
 GoogleAppsHandler::GoogleAppsHandler(PrefService* prefs,
                                      favicon::FaviconService* favicon_service)
@@ -81,6 +72,11 @@ void GoogleAppsHandler::RegisterMessages() {
       "addGoogleApps",
       base::BindRepeating(&GoogleAppsHandler::HandleAddGoogleApps,
                           base::Unretained(this)));
+
+  web_ui()->RegisterMessageCallback(
+      "getGoogleAppsList",
+      base::BindRepeating(&GoogleAppsHandler::HandleGetGoogleAppsList,
+                          base::Unretained(this)));
 }
 
 void GoogleAppsHandler::HandleRejectGoogleApps(const base::ListValue* args) {
@@ -91,14 +87,14 @@ void GoogleAppsHandler::HandleRejectGoogleApps(const base::ListValue* args) {
 
 void GoogleAppsHandler::HandleAddGoogleApps(const base::ListValue* args) {
   // Add bookmarks for all selected apps.
-  for (size_t i = 0; i < (size_t)GoogleApps::kCount; ++i) {
+  for (size_t i = 0; i < base::size(kGoogleApps); ++i) {
     bool selected = false;
     CHECK(args->GetBoolean(i, &selected));
     if (selected) {
       UMA_HISTOGRAM_ENUMERATION(
-          "FirstRun.NewUserExperience.GoogleAppsSelection", (GoogleApps)i,
-          GoogleApps::kCount);
-      GURL app_url = GURL(kGoogleAppUrls[i]);
+          "FirstRun.NewUserExperience.GoogleAppsSelection",
+          (GoogleApps)kGoogleApps[i].id, GoogleApps::kCount);
+      GURL app_url = GURL(kGoogleApps[i].url);
       // TODO(hcarmona): Add bookmark from JS.
 
       // Preload the favicon cache with Chrome-bundled images. Otherwise, the
@@ -107,7 +103,7 @@ void GoogleAppsHandler::HandleAddGoogleApps(const base::ListValue* args) {
       favicon_service_->MergeFavicon(
           app_url, app_url, favicon_base::IconType::kFavicon,
           ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
-              kGoogleAppIcons[i]),
+              kGoogleApps[i].icon),
           gfx::Size(kGoogleAppIconSize, kGoogleAppIconSize));
     }
   }
@@ -120,7 +116,18 @@ void GoogleAppsHandler::HandleAddGoogleApps(const base::ListValue* args) {
                             GoogleAppsInteraction::kCount);
 }
 
-void GoogleAppsHandler::AddSources(content::WebUIDataSource* html_source) {
+void GoogleAppsHandler::HandleGetGoogleAppsList(const base::ListValue* args) {
+  AllowJavascript();
+  CHECK_EQ(1U, args->GetSize());
+  const base::Value* callback_id;
+  CHECK(args->Get(0, &callback_id));
+  ResolveJavascriptCallback(
+      *callback_id,
+      bookmarkItemsToListValue(kGoogleApps, base::size(kGoogleApps)));
+}
+
+void GoogleAppsHandler::AddSources(content::WebUIDataSource* html_source,
+                                   PrefService* prefs) {
   // Localized strings.
   html_source->AddLocalizedString("noThanks", IDS_NO_THANKS);
   html_source->AddLocalizedString("getStarted",
@@ -170,6 +177,12 @@ void GoogleAppsHandler::AddSources(content::WebUIDataSource* html_source) {
                                IDR_NUX_GOOGLE_APPS_YOUTUBE_1X);
   html_source->AddResourcePath("apps/youtube_2x.png",
                                IDR_NUX_GOOGLE_APPS_YOUTUBE_2X);
+
+  // Add constants to loadtime data
+  html_source->AddBoolean(
+      "bookmark_bar_shown",
+      prefs->GetBoolean(bookmarks::prefs::kShowBookmarkBar));
+  html_source->SetJsonPath("strings.js");
 }
 
 }  // namespace nux

chrome/browser/ui/webui/welcome/nux/google_apps_handler.h

@@ -44,9 +44,11 @@ class GoogleAppsHandler : public content::WebUIMessageHandler {
   // Callbacks for JS APIs.
   void HandleRejectGoogleApps(const base::ListValue* args);
   void HandleAddGoogleApps(const base::ListValue* args);
+  void HandleGetGoogleAppsList(const base::ListValue* args);
 
   // Adds webui sources.
-  static void AddSources(content::WebUIDataSource* html_source);
+  static void AddSources(content::WebUIDataSource* html_source,
+                         PrefService* prefs);
 
  private:
   // Weak reference.

chrome/browser/ui/webui/welcome/welcome_ui.cc

@@ -111,7 +111,7 @@ WelcomeUI::WelcomeUI(content::WebUI* web_ui, const GURL& url)
     web_ui->AddMessageHandler(std::make_unique<nux::GoogleAppsHandler>(
         profile->GetPrefs(), FaviconServiceFactory::GetForProfile(
                                  profile, ServiceAccessType::EXPLICIT_ACCESS)));
-    nux::GoogleAppsHandler::AddSources(html_source);
+    nux::GoogleAppsHandler::AddSources(html_source, profile->GetPrefs());
 
     // Add set-as-default onboarding module.
     web_ui->AddMessageHandler(std::make_unique<nux::SetAsDefaultHandler>());