Add Google Assistant settings to the settings UI

Desktop / Chromium - Ryan Cui [chromium.org] - 25 July 2017 17:28 EDT

Does not currently launch an Intent when the "Google Assistant Settings" button is tapped. That'll be handled in a follow-up CL.

Mocks: https://gallery.googleplex.com/login?redirect_to=%2Fprojects%2FMCHbtQVoQ2HCZXdtrkhTAHBP%2Ffiles%2FMCFrtjARIqeeI-1EJbPSBa22wMSJbxAVNpw

Bug: 727873 Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation Change-Id: I25a7e7b2a99590447b90f3f91d5b64960f467eef Reviewed-on: https://chromium-review.googlesource.com/576474 Commit-Queue: Ryan Cui

79c1870 Add Google Assistant settings to the settings UI
chrome/app/settings_strings.grdp | 40 +++++++++++-
.../extensions/api/settings_private/prefs_util.cc | 6 ++
.../google_assistant_page/compiled_resources2.gyp | 25 ++++++++
.../google_assistant_browser_proxy.html | 2 +
.../google_assistant_browser_proxy.js | 55 +++++++++++++++++
.../google_assistant_page.html | 42 +++++++++++++
.../google_assistant_page/google_assistant_page.js | 47 ++++++++++++++
chrome/browser/resources/settings/route.js | 4 ++
.../settings/search_page/search_page.html | 40 +++++++++++-
.../resources/settings/search_page/search_page.js | 40 +++++++++++-
.../resources/settings/settings_resources.grd | 21 ++++++-
chrome/browser/ui/BUILD.gn | 2 +
.../settings/chromeos/google_assistant_handler.cc | 72 ++++++++++++++++++++++
.../settings/chromeos/google_assistant_handler.h | 41 ++++++++++++
.../md_settings_localized_strings_provider.cc | 55 +++++++++++++----
chrome/browser/ui/webui/settings/md_settings_ui.cc | 6 ++
16 files changed, 478 insertions(+), 20 deletions(-)

Upstream: git.chromium.org


  • Share