Commit ee1ae00d authored by Randy Rossi's avatar Randy Rossi Committed by Commit Bot

Check GetExtensionResourceManager for null

Chromecast implementation of ExtensionsBrowserClient can
return null for GetExtensionResourceManager. Added
a check to return early if null.

Bug: internal b/166307109
Test: Local display assistant build with screen reader extension
Change-Id: I61e3a1a55026d531e1947cd0d80e59e57d386a67
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2372890
Commit-Queue: Randy Rossi <rmrossi@chromium.org>
Reviewed-by: default avatarRyan Daum <rdaum@chromium.org>
Reviewed-by: default avatarKaran Bhatia <karandeepb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802374}
parent c8551c1d
...@@ -162,15 +162,18 @@ SubstitutionMap* GetLocalizationMessages( ...@@ -162,15 +162,18 @@ SubstitutionMap* GetLocalizationMessages(
void FillScriptFileResourceIds(const UserScript::FileList& script_files, void FillScriptFileResourceIds(const UserScript::FileList& script_files,
ScriptResourceIds& script_resource_ids) { ScriptResourceIds& script_resource_ids) {
const ComponentExtensionResourceManager* extension_resource_manager =
ExtensionsBrowserClient::Get()->GetComponentExtensionResourceManager();
if (!extension_resource_manager)
return;
for (const std::unique_ptr<UserScript::File>& script_file : script_files) { for (const std::unique_ptr<UserScript::File>& script_file : script_files) {
if (!script_file->GetContent().empty()) if (!script_file->GetContent().empty())
continue; continue;
int resource_id = 0; int resource_id = 0;
if (ExtensionsBrowserClient::Get() if (extension_resource_manager->IsComponentExtensionResource(
->GetComponentExtensionResourceManager() script_file->extension_root(), script_file->relative_path(),
->IsComponentExtensionResource(script_file->extension_root(), &resource_id)) {
script_file->relative_path(),
&resource_id)) {
script_resource_ids[script_file.get()] = resource_id; script_resource_ids[script_file.get()] = resource_id;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment