Commit a08dc036 authored by Michael Giuffrida's avatar Michael Giuffrida Committed by Commit Bot

Remove KioskNext feature and directory

Removes remaining KioskNext code and references.

Bug: 977019
Change-Id: Ic1d554d9771996f87e85ee2d335cbf82da2ec19d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1750264
Auto-Submit: Michael Giuffrida <michaelpg@chromium.org>
Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Reviewed-by: default avatarDominick Ng <dominickn@chromium.org>
Reviewed-by: default avatarBen Wells <benwells@chromium.org>
Commit-Queue: Michael Giuffrida <michaelpg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#686671}
parent 5af2a726
......@@ -67,9 +67,6 @@ const base::Feature kTrilinearFiltering{"TrilinearFiltering",
const base::Feature kUnlockWithExternalBinary{
"UnlockWithExternalBinary", base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kKioskNextShell{"KioskNextShell",
base::FEATURE_ENABLED_BY_DEFAULT};
const base::Feature kViewsLogin{"ViewsLogin", base::FEATURE_ENABLED_BY_DEFAULT};
const base::Feature kVirtualDesks{"VirtualDesks",
......
......@@ -85,9 +85,6 @@ ASH_PUBLIC_EXPORT extern const base::Feature kTrilinearFiltering;
// Enables running an external binary which provides lock screen authentication.
ASH_PUBLIC_EXPORT extern const base::Feature kUnlockWithExternalBinary;
// Enables the KioskNextShell feature.
ASH_PUBLIC_EXPORT extern const base::Feature kKioskNextShell;
// Enables views login.
ASH_PUBLIC_EXPORT extern const base::Feature kViewsLogin;
......
......@@ -317,9 +317,6 @@ void ArcApps::Launch(const std::string& app_id,
case apps::mojom::LaunchSource::kFromAppListRecommendation:
uit = arc::UserInteractionType::APP_STARTED_FROM_LAUNCHER_SUGGESTED_APP;
break;
case apps::mojom::LaunchSource::kFromKioskNextHome:
uit = arc::UserInteractionType::APP_STARTED_FROM_KIOSK_NEXT_HOME;
break;
case apps::mojom::LaunchSource::kFromParentalControls:
uit = arc::UserInteractionType::APP_STARTED_FROM_SETTINGS;
break;
......
......@@ -156,7 +156,6 @@ void BuiltInChromeOsApps::Launch(const std::string& app_id,
int64_t display_id) {
switch (launch_source) {
case apps::mojom::LaunchSource::kUnknown:
case apps::mojom::LaunchSource::kFromKioskNextHome:
case apps::mojom::LaunchSource::kFromParentalControls:
break;
case apps::mojom::LaunchSource::kFromAppListGrid:
......
......@@ -169,7 +169,6 @@ void ExtensionApps::Launch(const std::string& app_id,
switch (launch_source) {
case apps::mojom::LaunchSource::kUnknown:
case apps::mojom::LaunchSource::kFromKioskNextHome:
case apps::mojom::LaunchSource::kFromParentalControls:
break;
case apps::mojom::LaunchSource::kFromAppListGrid:
......
......@@ -13,7 +13,6 @@ ash::ShelfLaunchSource ConvertLaunchSource(
apps::mojom::LaunchSource launch_source) {
switch (launch_source) {
case apps::mojom::LaunchSource::kUnknown:
case apps::mojom::LaunchSource::kFromKioskNextHome:
case apps::mojom::LaunchSource::kFromParentalControls:
return ash::LAUNCH_FROM_UNKNOWN;
case apps::mojom::LaunchSource::kFromAppListGrid:
......
declare_args() {
# Whether Kiosk Next should be enabled.
enable_kiosk_next = is_chromeos
}
......@@ -109,10 +109,6 @@ class ComponentLoader {
const std::string& description_string);
void AddChromeOsSpeechSynthesisExtensions();
// Loads the Kiosk Next extension or adds it to the load list. If this device
// doesn't support Kiosk Next, this method is a no-op.
void AddKioskNextExtension();
#endif
void set_ignore_whitelist_for_testing(bool value) {
......
......@@ -26,10 +26,6 @@ import("//third_party/protobuf/proto_library.gni")
import("//ui/base/ui_features.gni")
import("//ui/views/features.gni")
if (is_chromeos) {
import("//chrome/browser/chromeos/kiosk_next_home/kiosk_next.gni")
}
# Use a static library here because many test binaries depend on this but don't
# require many files from it. This makes linking more efficient.
jumbo_split_static_library("ui") {
......@@ -1957,10 +1953,6 @@ jumbo_split_static_library("ui") {
if (use_cras) {
defines += [ "USE_CRAS" ]
}
if (enable_kiosk_next) {
defines += [ "KIOSK_NEXT" ]
}
}
if (is_win || is_mac || is_desktop_linux || is_chromeos) {
......
......@@ -84,7 +84,6 @@ const char* const kBuiltInFirstPartyExtensionIds[] = {
kZipArchiverExtensionId,
kChromeCameraAppId,
kChromeCameraAppDevId,
kKioskNextHomeAppId,
#endif // defined(OS_CHROMEOS)
nullptr, // Null-terminated array.
};
......@@ -119,7 +118,6 @@ const char kZipArchiverExtensionPath[] = "chromeos/zip_archiver";
const char kChromeCameraAppId[] = "hfhhnacclhffhdffklopdkcgdhifgngh";
const char kChromeCameraAppDevId[] = "flgnmkgjffmkephdokeeliiopbjaafpm";
const char kChromeCameraAppPath[] = "chromeos/camera";
const char kKioskNextHomeAppId[] = "nbaolgedfgoedkjbfmpediclncanmpbc";
#endif // defined(CHROME_OS)
......
......@@ -243,8 +243,6 @@ extern const char kChromeCameraAppId[];
extern const char kChromeCameraAppDevId[];
// Path to preinstalled Chrome camera app.
extern const char kChromeCameraAppPath[];
// The app ID of the Kiosk Next Home app.
extern const char kKioskNextHomeAppId[];
#endif
// What causes an extension to be installed? Used in histograms, so don't
......
......@@ -155,7 +155,6 @@ enum LaunchSource {
kFromAppListQuery, // Query-dependent results (larger icons).
kFromAppListQueryContextMenu, // Query-dependent results; context menu.
kFromAppListRecommendation, // Query-less recommendations (smaller icons).
kFromKioskNextHome, // Kiosk Next Home app.
kFromParentalControls, // Parental Controls Settings Section.
};
......
......@@ -45,10 +45,6 @@ if (is_android) {
include_js_tests = !(is_asan || is_msan || is_tsan)
}
if (is_chromeos) {
import("//chrome/browser/chromeos/kiosk_next_home/kiosk_next.gni")
}
# This target exists to reference other test executables to bring these files
# into the build.
group("test") {
......
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