Rename Contained Home to Kiosk Next Home.

Renaming to KioskNextHome to reflect the refactoring work and ultimate
goal. Also considered MojoKiosk, but Mojo team prefers to keep the Mojo
name referring specifically to the Mojo library, not uses of the library.

Bug: 933530
Change-Id: I3113fa6f2a8e95843a9bd82bfcf8a2c75b32bcfc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1491832Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Ben Wells <benwells@chromium.org>
Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Commit-Queue: Bruno Santos <brunoad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#638459}

chrome/browser/browser_resources.grd

@@ -559,7 +559,7 @@
         <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json" type="BINDATA" />
         <include name="IDR_QUICKOFFICE_MANIFEST" file="resources\chromeos\quickoffice\manifest.json" type="BINDATA" />
         <include name="IDR_PRODUCT_CHROMEOS_SYNC_CONSENT_SCREEN_ICONS" file="internal\resources\chromeos-sync-consent-icons.html" type="BINDATA" />
-        <include name="IDR_CONTAINED_HOME_MANIFEST" file="resources\chromeos\contained_home\manifest.json" type="BINDATA" />
+        <include name="IDR_KIOSK_NEXT_HOME_MANIFEST" file="resources\chromeos\kiosk_next_home\manifest.json" type="BINDATA" />
       </if>
       <if expr="is_win">
         <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_default_browser.js" flattenhtml="true" type="BINDATA" />

chrome/browser/chromeos/login/login_utils_browsertest.cc

@@ -166,7 +166,7 @@ IN_PROC_BROWSER_TEST_F(LoginUtilsKioskNextShellTest, PRE_KioskNextShellLaunch) {
   LoginAndSetKioskNextShellPref(true);
 }
 
-// Checks that the Contained Experience window is launched on sign-in when the
+// Checks that the Kiosk Next Home window is launched on sign-in when the
 // feature is enabled and its pref allows it.
 IN_PROC_BROWSER_TEST_F(LoginUtilsKioskNextShellTest, KioskNextShellLaunch) {
   // Enable all component extensions.
@@ -182,7 +182,7 @@ IN_PROC_BROWSER_TEST_F(LoginUtilsKioskNextShellTest, KioskNextShellLaunch) {
   apps::AppWindowWaiter waiter(
       extensions::AppWindowRegistry::Get(ProfileHelper::Get()->GetProfileByUser(
           user_manager::UserManager::Get()->GetActiveUser())),
-      extension_misc::kContainedHomeAppId);
+      extension_misc::kKioskNextHomeAppId);
   EXPECT_NE(nullptr,
             waiter.WaitForShownWithTimeout(TestTimeouts::action_timeout()));
   EXPECT_TRUE(fullscreen_observer.did_fullscreen_window_launch());
@@ -193,7 +193,7 @@ IN_PROC_BROWSER_TEST_F(LoginUtilsKioskNextShellTest,
   LoginAndSetKioskNextShellPref(false);
 }
 
-// Checks that the Contained Experience window does not launch in sign-in when
+// Checks that the Kiosk Next Home window does not launch in sign-in when
 // its pref is disabled
 IN_PROC_BROWSER_TEST_F(LoginUtilsKioskNextShellTest,
                        KioskNextShellDoesntLaunchWhenPrefIsDisabled) {
@@ -208,7 +208,7 @@ IN_PROC_BROWSER_TEST_F(LoginUtilsKioskNextShellTest,
   apps::AppWindowWaiter waiter(
       extensions::AppWindowRegistry::Get(ProfileHelper::Get()->GetProfileByUser(
           user_manager::UserManager::Get()->GetActiveUser())),
-      extension_misc::kContainedHomeAppId);
+      extension_misc::kKioskNextHomeAppId);
   EXPECT_EQ(nullptr,
             waiter.WaitForShownWithTimeout(TestTimeouts::action_timeout()));
 }

chrome/browser/extensions/component_extensions_whitelist/whitelist.cc

@@ -96,9 +96,9 @@ bool IsComponentExtensionWhitelisted(int manifest_resource_id) {
     case IDR_VIDEO_PLAYER_MANIFEST:
     case IDR_WALLPAPERMANAGER_MANIFEST:
 #if defined(GOOGLE_CHROME_BUILD)
-    case IDR_CONTAINED_HOME_MANIFEST:
     case IDR_GENIUS_APP_MANIFEST:
     case IDR_HELP_MANIFEST:
+    case IDR_KIOSK_NEXT_HOME_MANIFEST:
     case IDR_QUICKOFFICE_MANIFEST:
 #endif  // defined(GOOGLE_CHROME_BUILD)
 #endif  // defined(OS_CHROMEOS)

chrome/browser/extensions/component_loader.cc

@@ -555,8 +555,8 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
     }
 
     if (base::FeatureList::IsEnabled(ash::features::kKioskNextShell)) {
-      Add(IDR_CONTAINED_HOME_MANIFEST,
-          base::FilePath(FILE_PATH_LITERAL("chromeos/contained_home")));
+      Add(IDR_KIOSK_NEXT_HOME_MANIFEST,
+          base::FilePath(FILE_PATH_LITERAL("chromeos/kiosk_next_home")));
     }
 #endif  // defined(GOOGLE_CHROME_BUILD)
 

chrome/browser/resources/chromeos/BUILD.gn

@@ -25,9 +25,9 @@ group("closure_compile") {
   deps = [
     "bluetooth_pairing_dialog:closure_compile",
     "braille_ime:closure_compile",
-    "contained_home:closure_compile",
     "internet_config_dialog:closure_compile",
     "internet_detail_dialog:closure_compile",
+    "kiosk_next_home:closure_compile",
     "login:closure_compile",
     "multidevice_setup:closure_compile",
     "network_ui:closure_compile",

chrome/browser/resources/chromeos/contained_home/contained_home_resources.grdp

-<?xml version="1.0" encoding="utf-8"?>
-
-<grit-part>
-  <include name="IDR_CONTAINED_HOME_BG_JS" file="chromeos/contained_home/bg.js" type="BINDATA" />
-  <include name="IDR_CONTAINED_HOME_ICON_192" file="chromeos/contained_home/static/icon192.png" type="BINDATA" />
-  <include name="IDR_CONTAINED_HOME_MAIN_HTML" file="chromeos/contained_home/main.html" type="chrome_html" />
-  <include name="IDR_CONTAINED_HOME_API_JS" file="chromeos/contained_home/api.js" type="BINDATA" />
-  <include name="IDR_CONTAINED_HOME_API_IMPL_JS" file="chromeos/contained_home/api_impl.js" type="BINDATA" />
-</grit-part>

chrome/browser/resources/chromeos/contained_home/BUILD.gn → chrome/browser/resources/chromeos/kiosk_next_home/BUILD.gn

@@ -6,11 +6,11 @@ import("//third_party/closure_compiler/compile_js.gni")
 
 js_type_check("closure_compile") {
   deps = [
-    ":contained_home_api",
+    ":kiosk_next_api",
   ]
 }
 
-js_library("contained_home_api") {
+js_library("kiosk_next_api") {
   sources = [
     "api.js",
     "api_impl.js",

chrome/browser/resources/chromeos/contained_home/api.js → chrome/browser/resources/chromeos/kiosk_next_home/api.js

@@ -3,24 +3,24 @@
 // found in the LICENSE file.
 
 /**
- * @fileoverview Chrome OS Contained Home API definition.
+ * @fileoverview Chrome OS Kiosk Next Home API definition.
  */
 
 /**
- * Namespace for the contained home bridge and related data.
+ * Namespace for the Kiosk Next Home bridge and related data.
  * @const
  */
-var containedHome = {};
+var kioskNextHome = {};
 
 /**
- * System bridge API for the contained home experience.
+ * System bridge API for the Kiosk Next Home.
  *
  * @interface
  */
-containedHome.Bridge = class {
+kioskNextHome.Bridge = class {
   /**
    * Adds listener for system events.
-   * @param {!containedHome.Listener} listener Listener for system events.
+   * @param {!kioskNextHome.Listener} listener Listener for system events.
    */
   addListener(listener) {}
 
@@ -34,14 +34,14 @@ containedHome.Bridge = class {
 
   /**
    * Returns a list of apps installed in the user session.
-   * @return {!Promise<!Array<!containedHome.InstalledApp>>} Promise for the
+   * @return {!Promise<!Array<!kioskNextHome.InstalledApp>>} Promise for the
    *     list of apps.
    */
   getInstalledApps() {}
 
   /**
    * Launches a content (app, video, etc).
-   * @param {!containedHome.ContentSource} contentSource
+   * @param {!kioskNextHome.ContentSource} contentSource
    * @param {string} contentId
    * @param {?Object=} opt_params Optional params to locate the content.
    * @return {!Promise<boolean>} Promise that is resolved after the content is
@@ -56,7 +56,7 @@ containedHome.Bridge = class {
  * A "Content Source" describes how to launch/view the content.
  * @enum {string}
  */
-containedHome.ContentSource = {
+kioskNextHome.ContentSource = {
   /** The content is, or is hosted inside, an ARC++ app. */
   ARC_INTENT: 'arc_intent',
 };
@@ -65,7 +65,7 @@ containedHome.ContentSource = {
  * Types of installed apps on ChromeOS.
  * @enum {string}
  */
-containedHome.AppType = {
+kioskNextHome.AppType = {
   /** The app is an ARC++ app (Android app). */
   ARC: 'arc',
 };
@@ -74,9 +74,9 @@ containedHome.AppType = {
  * A record representing an installed app on the system.
  * @record
  */
-containedHome.InstalledApp = class {
+kioskNextHome.InstalledApp = class {
   constructor() {
-    /** @type {!containedHome.AppType} The type of app. */
+    /** @type {!kioskNextHome.AppType} The type of app. */
     this.appType;
     /**
      * @type {string} Stable, unique identifier for the app. For ARC++ apps,
@@ -96,22 +96,22 @@ containedHome.InstalledApp = class {
  * Different ways an installed app can change.
  * @enum {string}
  */
-containedHome.AppEventType = {
+kioskNextHome.AppEventType = {
   INSTALLED: 'installed',
   UNINSTALLED: 'uninstalled',
 };
 
 /**
  * Interface for a listener of system events, subscribed via
- * {!containedHome.Bridge}.
+ * {!kioskNextHome.Bridge}.
  *
  * @interface
  */
-containedHome.Listener = class {
+kioskNextHome.Listener = class {
   /**
    * Called when an app state change.
-   * @param {!containedHome.InstalledApp} app The app whose state changed.
-   * @param {!containedHome.AppEventType} appEventType Type of the event
+   * @param {!kioskNextHome.InstalledApp} app The app whose state changed.
+   * @param {!kioskNextHome.AppEventType} appEventType Type of the event
    *     indicating what changed for the app.
    */
   onInstalledAppChanged(app, appEventType) {}
@@ -119,7 +119,7 @@ containedHome.Listener = class {
 
 /**
  * Provides bridge implementation.
- * @return {!containedHome.Bridge} Bridge instance that can be used to interact
+ * @return {!kioskNextHome.Bridge} Bridge instance that can be used to interact
  *     with ChromeOS.
  */
-containedHome.getChromeOsBridge = function() {};
+kioskNextHome.getChromeOsBridge = function() {};

chrome/browser/resources/chromeos/contained_home/api_impl.js → chrome/browser/resources/chromeos/kiosk_next_home/api_impl.js

@@ -3,18 +3,18 @@
 // found in the LICENSE file.
 
 /**
- * @fileoverview ContainedHome implementation.
+ * @fileoverview Kiosk Next Home API implementation.
  */
 
-/** @implements {containedHome.Bridge} */
-class ContainedHomeBridge {
+/** @implements {kioskNextHome.Bridge} */
+class KioskNextHomeBridge {
   constructor() {
-    /** @type {!Array<!containedHome.Listener>} */
+    /** @type {!Array<!kioskNextHome.Listener>} */
     this.listeners = [];
 
     chrome.arcAppsPrivate.onInstalled.addListener(installedApp => {
       const app = {
-        appType: containedHome.AppType.ARC,
+        appType: kioskNextHome.AppType.ARC,
         appId: installedApp.packageName,
         displayName: installedApp.packageName,
         suspended: false,
@@ -22,7 +22,7 @@ class ContainedHomeBridge {
       };
       for (const listener of this.listeners) {
         listener.onInstalledAppChanged(
-            app, containedHome.AppEventType.INSTALLED);
+            app, kioskNextHome.AppEventType.INSTALLED);
       }
     });
   }
@@ -52,7 +52,7 @@ class ContainedHomeBridge {
         const installedApps = [];
         for (const launchableApp of launchableApps) {
           installedApps.push({
-            appType: containedHome.AppType.ARC,
+            appType: kioskNextHome.AppType.ARC,
             appId: launchableApp.packageName,
             displayName: launchableApp.packageName,
             suspended: false,
@@ -66,7 +66,7 @@ class ContainedHomeBridge {
 
   /** @override */
   launchContent(contentSource, contentId, opt_params) {
-    if (contentSource === containedHome.ContentSource.ARC_INTENT) {
+    if (contentSource === kioskNextHome.ContentSource.ARC_INTENT) {
       // TODO(brunoad): create and migrate to a more generic API.
       chrome.arcAppsPrivate.launchApp(contentId);
     }
@@ -76,9 +76,9 @@ class ContainedHomeBridge {
 
 /**
  * Provides bridge implementation.
- * @return {!containedHome.Bridge} Bridge instance that can be used to interact
+ * @return {!kioskNextHome.Bridge} Bridge instance that can be used to interact
  *     with ChromeOS.
  */
-containedHome.getChromeOsBridge = function() {
-  return new ContainedHomeBridge();
+kioskNextHome.getChromeOsBridge = function() {
+  return new KioskNextHomeBridge();
 };

chrome/browser/resources/chromeos/kiosk_next_home/kiosk_next_resources.grdp

+<?xml version="1.0" encoding="utf-8"?>
+
+<grit-part>
+  <include name="IDR_KIOSK_NEXT_BG_JS" file="chromeos/kiosk_next_home/bg.js" type="BINDATA" />
+  <include name="IDR_KIOSK_NEXT_ICON_192" file="chromeos/kiosk_next_home/static/icon192.png" type="BINDATA" />
+  <include name="IDR_KIOSK_NEXT_MAIN_HTML" file="chromeos/kiosk_next_home/main.html" type="chrome_html" />
+  <include name="IDR_KIOSK_NEXT_API_JS" file="chromeos/kiosk_next_home/api.js" type="BINDATA" />
+  <include name="IDR_KIOSK_NEXT_API_IMPL_JS" file="chromeos/kiosk_next_home/api_impl.js" type="BINDATA" />
+</grit-part>

chrome/browser/resources/chromeos/contained_home/manifest.json → chrome/browser/resources/chromeos/kiosk_next_home/manifest.json

 {
   // chrome-extension://nbaolgedfgoedkjbfmpediclncanmpbc/
   "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq8KnOSFXgBTWY7w+jQ/T1kPD9r821cEgvPdcot2XBdA2OVF2+TJjyLmLRa/AVQzpsMrEWzPbbXSil+GFjWsiWzcohuLphMQe5pHzRVXd19ouJZNr+KL16/e74fZ77ECI9R/D0Vh6it/QICdCaLgHbjWo2AS7vhJGtp2GJcWpXG5sbG8W8BDayY5qySwAE35dFjpeeR0bDTz44+9LFE0s+sd65LDwn37nc+pJvDNNYipGP2lYC9eMk1wAydz9x3c2iYRzcGyHjbX1Z7gQvM4w8Amdjsb8f5mZeXGNKE+gvcD7kyiR7rXgK1EfaNvDCzl/uIXXPfIh5oUK9iUkdX6oNwIDAQAB",
-  "name": "Contained Home",
+  "name": "Kiosk Next Home",
   "version": "0.1.0",
   "manifest_version": 2,
-  "description": "Contained Home",
+  "description": "Kiosk Next Home",
   "icons": {
     "192": "static/icon192.png"
   },

chrome/browser/resources/component_extension_resources.grd

@@ -91,8 +91,8 @@
         <include name="IDR_ARC_SUPPORT_RECOMMEND_APP_LIST_VIEW_JS" file="chromeos/arc_support/recommend_app_list_view.js" type="BINDATA" />
         <include name="IDR_ARC_SUPPORT_RECOMMEND_APP_LIST_VIEW_HTML" file="chromeos/arc_support/recommend_app_list_view.html" type="chrome_html" flattenhtml="true" />
         <if expr="_google_chrome">
-          <part file="chromeos/contained_home/contained_home_resources.grdp" />
-          <part file="chromeos/contained_home/contained_home_resources_internal.grdp" />
+          <part file="chromeos/kiosk_next_home/kiosk_next_resources.grdp" />
+          <part file="chromeos/kiosk_next_home/kiosk_next_resources_internal.grdp" />
         </if>
       </if>
       <if expr="enable_plugins">

chrome/browser/ui/ash/kiosk_next_shell_client.cc

@@ -38,7 +38,7 @@ void KioskNextShellClient::LaunchKioskNextShell(const AccountId& account_id) {
       chromeos::ProfileHelper::Get()->GetProfileByAccountId(account_id);
   const extensions::Extension* app =
       extensions::ExtensionRegistry::Get(profile)->GetInstalledExtension(
-          extension_misc::kContainedHomeAppId);
+          extension_misc::kKioskNextHomeAppId);
   DCHECK(app);
   apps::LaunchPlatformApp(profile, app,
                           extensions::AppLaunchSource::SOURCE_CHROME_INTERNAL);

chrome/common/extensions/extension_constants.cc

@@ -73,7 +73,7 @@ const char kZipArchiverExtensionPath[] = "chromeos/zip_archiver";
 const char kChromeCameraAppId[] = "hfhhnacclhffhdffklopdkcgdhifgngh";
 const char kChromeCameraAppDevId[] = "flgnmkgjffmkephdokeeliiopbjaafpm";
 const char kChromeCameraAppPath[] = "chromeos/camera";
-const char kContainedHomeAppId[] = "nbaolgedfgoedkjbfmpediclncanmpbc";
+const char kKioskNextHomeAppId[] = "nbaolgedfgoedkjbfmpediclncanmpbc";
 #endif
 
 const char kAppStateNotInstalled[] = "not_installed";

chrome/common/extensions/extension_constants.h

@@ -235,8 +235,8 @@ extern const char kChromeCameraAppId[];
 extern const char kChromeCameraAppDevId[];
 // Path to preinstalled Chrome camera app.
 extern const char kChromeCameraAppPath[];
-// The app ID of the contained home app.
-extern const char kContainedHomeAppId[];
+// 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