Commit 56db9c7f authored by Jing Wang's avatar Jing Wang Committed by Commit Bot

Handle null arc package name.

Also use std::find instead of for loop.

Bug: 1103460
Change-Id: I33820ac380affe154ddce640093c7700c1e1c3bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2289172
Commit-Queue: Jing Wang <jiwan@chromium.org>
Reviewed-by: default avatarDarren Shen <shend@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786586}
parent dd6d018b
...@@ -166,16 +166,16 @@ bool IsAllowedApp(const char* (&allowedApps)[N]) { ...@@ -166,16 +166,16 @@ bool IsAllowedApp(const char* (&allowedApps)[N]) {
return false; return false;
// TODO(crbug/1094113): improve to cover more scenarios such as chat heads. // TODO(crbug/1094113): improve to cover more scenarios such as chat heads.
const std::string* app_id = window->GetProperty(ash::kAppIDKey);
const std::string* arc_package_name = const std::string* arc_package_name =
window->GetProperty(ash::kArcPackageNameKey); window->GetProperty(ash::kArcPackageNameKey);
if (app_id) { if (arc_package_name && std::find(allowedApps, allowedApps + N,
for (size_t i = 0; i < N; i++) { *arc_package_name) != allowedApps + N) {
if (strcmp(app_id->c_str(), allowedApps[i]) == 0 || return true;
strcmp(arc_package_name->c_str(), allowedApps[i]) == 0) { }
return true; const std::string* app_id = window->GetProperty(ash::kAppIDKey);
} if (app_id &&
} std::find(allowedApps, allowedApps + N, *app_id) != allowedApps + N) {
return true;
} }
return false; return false;
} }
......
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