[CrOS settings] Updated OS route path (PRINTING) string

Before this CL some os and browser routes had the same name. This was
a bit confusing. If some c++ code called the route '/printing', it is
not clear if this url is a chrome or browser subpage. A distinction
needed to be made. This CL renames OS specific route PRINTING, which
is shared with browser routes to a more distinguishable name
OS_PRINTING. Allowing this bug(990169) to be unblocked.

Bug: 990169
Change-Id: I71eea6ecea249c20ef0c3083aaddd3fb714a2162
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2126332
Commit-Queue: Nnamdi Theodore Johnson-kanu <tjohnsonkanu@google.com>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756137}

chrome/browser/resources/settings/chromeos/os_route.js

@@ -105,7 +105,7 @@ cr.define('settings', function() {
     r.OS_LANGUAGES_INPUT_METHODs =
         r.OS_LANGUAGES.createChild('/osLanguages/inputMethods');
 
-    r.PRINTING = r.ADVANCED.createSection('/printing', 'printing');
+    r.OS_PRINTING = r.ADVANCED.createSection('/osPrinting', 'osPrinting');
 
     r.OS_ACCESSIBILITY = r.ADVANCED.createSection('/osAccessibility', 'a11y');
 
@@ -150,7 +150,7 @@ cr.define('settings', function() {
     r.DATETIME = r.ADVANCED.createSection('/dateTime', 'dateTime');
     r.DATETIME_TIMEZONE_SUBPAGE = r.DATETIME.createChild('/dateTime/timeZone');
 
-    r.CUPS_PRINTERS = r.PRINTING.createChild('/cupsPrinters');
+    r.CUPS_PRINTERS = r.OS_PRINTING.createChild('/cupsPrinters');
 
     r.MANAGE_ACCESSIBILITY =
         r.OS_ACCESSIBILITY.createChild('/manageAccessibility');

chrome/browser/resources/settings/chromeos/os_settings_menu/os_settings_menu.html

@@ -256,7 +256,7 @@
               $i18n{filesPageTitle}
             </div>
           </a>
-          <a href="/printing">
+          <a href="/osPrinting">
             <div class="item">
               <iron-icon icon="cr:print"></iron-icon>
               $i18n{printingPageTitle}

chrome/browser/resources/settings/chromeos/os_settings_page/os_settings_page.html

@@ -239,7 +239,7 @@
             </settings-section>
           </template>
           <settings-section page-title="$i18n{printingPageTitle}"
-              section="printing">
+              section="osPrinting">
             <os-settings-printing-page prefs="{{prefs}}">
             </os-settings-printing-page>
           </settings-section>

chrome/browser/resources/settings/chromeos/os_settings_routes.js

@@ -53,6 +53,7 @@
  *   OS_LANGUAGES: !settings.Route,
  *   OS_LANGUAGES_DETAILS: !settings.Route,
  *   OS_LANGUAGES_INPUT_METHODS: !settings.Route,
+ *   OS_PRINTING: !settings.Route,
  *   OS_RESET: !settings.Route,
  *   OS_SEARCH: !settings.Route,
  *   OS_SYNC: !settings.Route,
@@ -63,7 +64,6 @@
  *   PLUGIN_VM_SHARED_PATHS: !settings.Route,
  *   POINTERS: !settings.Route,
  *   POWER: !settings.Route,
- *   PRINTING: !settings.Route,
  *   PRIVACY: !settings.Route,
  *   SEARCH: !settings.Route,
  *   RESET: !settings.Route,

chrome/browser/ui/ash/chrome_new_window_client.cc

@@ -121,6 +121,7 @@ constexpr std::pair<arc::mojom::ChromePage, const char*> kOSSettingsMapping[] =
      {ChromePage::PLUGINVMDETAILS, chrome::kPluginVmDetailsSubPage},
      {ChromePage::PLUGINVMSHAREDPATHS, chrome::kPluginVmSharedPathsSubPage},
      {ChromePage::OSACCESSIBILITY, chrome::kOsAccessibilitySubPage},
+     {ChromePage::OSPRINTING, chrome::kOsPrintingSubPage},
      {ChromePage::OSRESET, chrome::kOsResetSubPage},
      {ChromePage::OSSEARCH, chrome::kOsSearchSubPage},
      {ChromePage::POINTEROVERLAY, chrome::kPointerOverlaySubPage},
@@ -144,6 +145,7 @@ constexpr std::pair<arc::mojom::ChromePage, const char*>
         {ChromePage::PASSWORDS, chrome::kPasswordManagerSubPage},
         {ChromePage::PRIVACY, chrome::kPrivacySubPage},
         {ChromePage::RESET, chrome::kResetSubPage},
+        {ChromePage::PRINTING, chrome::kPrintingSettingsSubPage},
         {ChromePage::SEARCH, chrome::kSearchSubPage},
         {ChromePage::SYNCSETUP, chrome::kSyncSetupSubPage},
         {ChromePage::LANGUAGES, chrome::kLanguagesSubPage},

chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc

@@ -280,6 +280,8 @@ void TestAllOSSettingPages(const GURL& base_url) {
                      base_url.Resolve(chrome::kManageAccessibilitySubPage));
   TestOpenChromePage(ChromePage::NETWORKSTYPEVPN,
                      base_url.Resolve(chrome::kVPNSettingsSubPage));
+  TestOpenChromePage(ChromePage::OSPRINTING,
+                     base_url.Resolve(chrome::kOsPrintingSubPage));
   TestOpenChromePage(ChromePage::POINTEROVERLAY,
                      base_url.Resolve(chrome::kPointerOverlaySubPage));
   TestOpenChromePage(ChromePage::OSRESET,
@@ -363,6 +365,8 @@ void TestAllBrowserSettingPages(const GURL& base_url) {
                      base_url.Resolve(chrome::kPasswordManagerSubPage));
   TestOpenChromePage(ChromePage::RESET,
                      base_url.Resolve(chrome::kResetSubPage));
+  TestOpenChromePage(ChromePage::PRINTING,
+                     base_url.Resolve(chrome::kPrintingSettingsSubPage));
   TestOpenChromePage(ChromePage::SEARCH,
                      base_url.Resolve(chrome::kSearchSubPage));
   TestOpenChromePage(ChromePage::SYNCSETUP,

chrome/common/webui_url_constants.cc

@@ -429,6 +429,7 @@ const char kNativePrintingSettingsSubPage[] = "cupsPrinters";
 const char kNetworkDetailSubPage[] = "networkDetail";
 const char kNetworksSubPage[] = "networks";
 const char kOsAccessibilitySubPage[] = "osAccessibility";
+const char kOsPrintingSubPage[] = "osPrinting";
 const char kOsResetSubPage[] = "osReset";
 const char kOsSearchSubPage[] = "osSearch";
 const char kPluginVmDetailsSubPage[] = "pluginVm/details";
@@ -488,6 +489,7 @@ bool IsOSSettingsSubPage(const std::string& sub_page) {
       kOsLanguagesSubPage,
       kOsLanguagesDetailsSubPage,
       kOsLanguagesInputMethodsSubPage,
+      kOsPrintingSubPage,
       kOsResetSubPage,
       kOsSearchSubPage,
       kPointerOverlaySubPage,

chrome/common/webui_url_constants.h

@@ -389,6 +389,7 @@ extern const char kOsAccessibilitySubPage[];
 extern const char kOsLanguagesSubPage[];
 extern const char kOsLanguagesDetailsSubPage[];
 extern const char kOsLanguagesInputMethodsSubPage[];
+extern const char kOsPrintingSubPage[];
 extern const char kOsResetSubPage[];
 extern const char kOsSearchSubPage[];
 extern const char kPluginVmDetailsSubPage[];

components/arc/mojom/intent_helper.mojom

@@ -173,14 +173,16 @@ enum ChromePage {
   AMBIENTMODE,
   PLUGINVMDETAILS,
   PLUGINVMSHAREDPATHS,
-  OSRESET,
   OSACCESSIBILITY,
   OSLANGUAGES,
   OSLANGUAGESDETAILS,
   OSLANGUAGESINPUTMETHODS,
+  OSPRINTING,
+  PRINTING,
   OSSEARCH,
+  OSRESET,
 
-  LAST = OSSEARCH,
+  LAST = OSRESET,
 };
 
 // Describes an unique chrome app.