[App Management] Change the host URL of App Management.

Change the host URL of App Management from chrome://apps to
chrome://app-management.

Bug: 949397
Change-Id: I84679310872fd1d74ceef20b58f335e99f81aaca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1556863Reviewed-by: calamity <calamity@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Commit-Queue: Jeevan Shikaram <jshikaram@chromium.org>
Cr-Commit-Position: refs/heads/master@{#649794}

chrome/browser/ui/browser_navigator.cc

@@ -748,6 +748,7 @@ bool IsHostAllowedInIncognito(const GURL& url) {
   // chrome://extensions is on the list because it redirects to
   // chrome://settings.
   return host != chrome::kChromeUIAppLauncherPageHost &&
+         host != chrome::kChromeUIAppManagementHost &&
          host != chrome::kChromeUISettingsHost &&
          host != chrome::kChromeUIHelpHost &&
          host != chrome::kChromeUIHistoryHost &&

chrome/browser/ui/webui/app_management/app_management_ui.cc

@@ -26,7 +26,7 @@ namespace {
 
 content::WebUIDataSource* CreateAppManagementUIHTMLSource(Profile* profile) {
   content::WebUIDataSource* source =
-      content::WebUIDataSource::Create(chrome::kChromeUIAppLauncherPageHost);
+      content::WebUIDataSource::Create(chrome::kChromeUIAppManagementHost);
 
   source->AddLocalizedString("appListTitle", IDS_APP_MANAGEMENT_APP_LIST_TITLE);
   source->AddLocalizedString("appNoPermission",

chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -432,7 +432,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
    ***************************************************************************/
 #if !defined(OS_ANDROID)
   if (AppManagementUI::IsEnabled() &&
-      url.host_piece() == chrome::kChromeUIAppLauncherPageHost && profile &&
+      url.host_piece() == chrome::kChromeUIAppManagementHost && profile &&
       !profile->IsGuestSession()) {
     return &NewWebUI<AppManagementUI>;
   }
@@ -453,6 +453,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
   }
   if (profile->IsGuestSession() &&
       (url.host_piece() == chrome::kChromeUIAppLauncherPageHost ||
+       url.host_piece() == chrome::kChromeUIAppManagementHost ||
        url.host_piece() == chrome::kChromeUIBookmarksHost ||
        url.host_piece() == chrome::kChromeUIHistoryHost ||
        url.host_piece() == chrome::kChromeUIExtensionsHost)) {

chrome/common/webui_url_constants.cc

@@ -22,7 +22,7 @@ const char kChromeUIAccessibilityHost[] = "accessibility";
 const char kChromeUIAppIconHost[] = "app-icon";
 const char kChromeUIAppIconURL[] = "chrome://app-icon/";
 const char kChromeUIAppLauncherPageHost[] = "apps";
-const char kChromeUIAppManagementHost[] = "apps";
+const char kChromeUIAppManagementHost[] = "app-management";
 const char kChromeUIAppsURL[] = "chrome://apps/";
 const char kChromeUIAutofillInternalsHost[] = "autofill-internals";
 const char kChromeUIBluetoothInternalsHost[] = "bluetooth-internals";

chrome/services/app_service/README.md

@@ -4,7 +4,7 @@ Chrome, and especially Chrome OS, has apps, e.g. chat apps and camera apps.
 
 There are a number (lets call it `M`) of different places or app Consumers,
 usually UI (user interfaces) related, where users interact with their installed
-apps: e.g. launcher, search bar, shelf, New Tab Page, the `chrome://apps` page,
+apps: e.g. launcher, search bar, shelf, New Tab Page, the App Management page,
 permissions or settings pages, picking and running default handlers for URLs,
 MIME types or intents, etc.
 

chrome/test/data/webui/app_management/app_management_browsertest.js

@@ -16,7 +16,7 @@ function AppManagementBrowserTest() {}
 AppManagementBrowserTest.prototype = {
   __proto__: PolymerTest.prototype,
 
-  browsePreload: 'chrome://apps',
+  browsePreload: 'chrome://app-management',
 
   extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
     '../test_store.js',