diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-13 15:05:36 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-14 10:33:47 +0000 |
commit | e684a3455bcc29a6e3e66a004e352dea4e1141e7 (patch) | |
tree | d55b4003bde34d7d05f558f02cfd82b2a66a7aac /chromium/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc | |
parent | 2b94bfe47ccb6c08047959d1c26e392919550e86 (diff) | |
download | qtwebengine-chromium-e684a3455bcc29a6e3e66a004e352dea4e1141e7.tar.gz |
BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0
Change-Id: Ic57220b00ecc929a893c91f5cc552f5d3e99e922
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc')
-rw-r--r-- | chromium/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chromium/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chromium/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc index 6d29d83b006..e485a43a713 100644 --- a/chromium/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc +++ b/chromium/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc @@ -10,6 +10,7 @@ #include "ash/public/cpp/ash_features.h" #include "ash/public/cpp/ash_switches.h" +#include "ash/public/cpp/resources/grit/ash_public_unscaled_resources.h" #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h" @@ -224,6 +225,8 @@ void AddLockDisplayTypeDefaultResources(content::WebUIDataSource* source) { void AddDiscoverDisplayTypeDefaultResources(content::WebUIDataSource* source) { source->SetDefaultResource(IDR_CHROMEOS_DISCOVER_APP_HTML); source->AddResourcePath(kDiscoverJSPath, IDR_CHROMEOS_DISCOVER_APP_JS); + source->AddResourcePath("manifest.json", IDR_CHROMEOS_DISCOVER_MANIFEST); + source->AddResourcePath("logo.png", IDR_DISCOVER_APP_192); } // Default and non-shared resource definition for kLoginDisplay display type. |