Commit 730f0fe9 authored by Wei Lee's avatar Wei Lee Committed by Commit Bot

[CCA] Disable CCA in Guest mode

Since currently it will crash Chrome when launching CCA (SWA version) in
guest mode. Since for platform app version of CCA, it is not in the
guest mode either, temporarily remove CCA from guest mode until we solve
the crash issue.

Bug: b/174223194
Test: Enter guest mode and CCA is not in the launcher
Change-Id: I10aca86664e84fb70c61d1bc0bef0f8d5da31004
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2560348
Commit-Queue: Wei Lee <wtlee@chromium.org>
Commit-Queue: Giovanni Ortuño Urquidi <ortuno@chromium.org>
Auto-Submit: Wei Lee <wtlee@chromium.org>
Reviewed-by: default avatarGiovanni Ortuño Urquidi <ortuno@chromium.org>
Cr-Commit-Position: refs/heads/master@{#831272}
parent 35800d23
...@@ -87,6 +87,7 @@ source_set("web_applications") { ...@@ -87,6 +87,7 @@ source_set("web_applications") {
"//components/services/app_service/public/cpp:app_url_handling", "//components/services/app_service/public/cpp:app_url_handling",
"//components/services/app_service/public/cpp:protocol_handling", "//components/services/app_service/public/cpp:protocol_handling",
"//components/sync", "//components/sync",
"//components/user_manager",
"//content/public/browser", "//content/public/browser",
"//services/metrics/public/cpp:ukm_builders", "//services/metrics/public/cpp:ukm_builders",
"//skia", "//skia",
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include "chrome/grit/generated_resources.h" #include "chrome/grit/generated_resources.h"
#include "components/pref_registry/pref_registry_syncable.h" #include "components/pref_registry/pref_registry_syncable.h"
#include "components/prefs/pref_service.h" #include "components/prefs/pref_service.h"
#include "components/user_manager/user_manager.h"
#include "components/version_info/version_info.h" #include "components/version_info/version_info.h"
#include "content/public/browser/navigation_handle.h" #include "content/public/browser/navigation_handle.h"
#include "content/public/browser/url_data_source.h" #include "content/public/browser/url_data_source.h"
...@@ -339,7 +340,8 @@ bool SystemWebAppManager::IsAppEnabled(SystemAppType type) { ...@@ -339,7 +340,8 @@ bool SystemWebAppManager::IsAppEnabled(SystemAppType type) {
return true; return true;
case SystemAppType::CAMERA: case SystemAppType::CAMERA:
return base::FeatureList::IsEnabled( return base::FeatureList::IsEnabled(
chromeos::features::kCameraSystemWebApp); chromeos::features::kCameraSystemWebApp) &&
!user_manager::UserManager::Get()->IsLoggedInAsGuest();
case SystemAppType::TERMINAL: case SystemAppType::TERMINAL:
return true; return true;
case SystemAppType::MEDIA: case SystemAppType::MEDIA:
......
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