[CrOS Settings] Add Ethernet and Cellular subpage constants.

These subpages have existed for a long time, but they did not have
associated constants.

Change-Id: Ib5612190dde72ee66ed53d6b76ee7f5d90e5f826
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2080891
Auto-Submit: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746193}

chrome/browser/ui/ash/chrome_new_window_client.cc

@@ -85,6 +85,7 @@ constexpr std::pair<arc::mojom::ChromePage, const char*> kOSSettingsMapping[] =
      {ChromePage::ASSISTANT, chrome::kAssistantSubPage},
      {ChromePage::BLUETOOTH, chrome::kBluetoothSubPage},
      {ChromePage::BLUETOOTHDEVICES, chrome::kBluetoothSubPage},
+     {ChromePage::CELLULAR, chrome::kCellularSettingsSubPage},
      {ChromePage::CHANGEPICTURE, chrome::kChangePictureSubPage},
      {ChromePage::CROSTINIDISKRESIZE, chrome::kCrostiniDiskResizeSubPage},
      {ChromePage::CONNECTEDDEVICES, chrome::kConnectedDevicesSubPage},
@@ -95,6 +96,7 @@ constexpr std::pair<arc::mojom::ChromePage, const char*> kOSSettingsMapping[] =
      {ChromePage::CUPSPRINTERS, chrome::kNativePrintingSettingsSubPage},
      {ChromePage::DATETIME, chrome::kDateTimeSubPage},
      {ChromePage::DISPLAY, chrome::kDisplaySubPage},
+     {ChromePage::ETHERNET, chrome::kEthernetSettingsSubPage},
      {ChromePage::EXTERNALSTORAGE, chrome::kExternalStorageSubPage},
      {ChromePage::HELP, chrome::kHelpSubPage},
      {ChromePage::INTERNET, chrome::kInternetSubPage},

chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc

@@ -324,6 +324,10 @@ void TestAllOSSettingPages(const GURL& base_url) {
                      base_url.Resolve(chrome::kSwitchAccessSubPage));
   TestOpenChromePage(ChromePage::TETHERSETTINGS,
                      base_url.Resolve(chrome::kTetherSettingsSubPage));
+  TestOpenChromePage(ChromePage::ETHERNET,
+                     base_url.Resolve(chrome::kEthernetSettingsSubPage));
+  TestOpenChromePage(ChromePage::CELLULAR,
+                     base_url.Resolve(chrome::kCellularSettingsSubPage));
 }
 
 void TestAllBrowserSettingPages(const GURL& base_url) {

chrome/common/webui_url_constants.cc

@@ -436,6 +436,8 @@ const char kSwitchAccessSubPage[] = "manageAccessibility/switchAccess";
 const char kTetherSettingsSubPage[] = "networks?type=Tether";
 const char kVPNSettingsSubPage[] = "networks?type=VPN";
 const char kWiFiSettingsSubPage[] = "networks?type=WiFi";
+const char kEthernetSettingsSubPage[] = "networks?type=Ethernet";
+const char kCellularSettingsSubPage[] = "networks?type=Cellular";
 
 // Any changes here need to be kept in sync with chrome_new_window_client.cc
 bool IsOSSettingsSubPage(const std::string& sub_page) {
@@ -449,6 +451,7 @@ bool IsOSSettingsSubPage(const std::string& sub_page) {
       kAppManagementSubPage,
       kAssistantSubPage,
       kBluetoothSubPage,
+      kCellularSettingsSubPage,
       kChangePictureSubPage,
       kConnectedDevicesSubPage,
       kCrostiniSharedPathsSubPage,
@@ -457,6 +460,7 @@ bool IsOSSettingsSubPage(const std::string& sub_page) {
       kCrostiniExportImportSubPage,
       kDateTimeSubPage,
       kDisplaySubPage,
+      kEthernetSettingsSubPage,
       kExternalStorageSubPage,
       kHelpSubPage,
       kInternetSubPage,

chrome/common/webui_url_constants.h

@@ -389,6 +389,8 @@ extern const char kSwitchAccessSubPage[];
 extern const char kTetherSettingsSubPage[];
 extern const char kVPNSettingsSubPage[];
 extern const char kWiFiSettingsSubPage[];
+extern const char kEthernetSettingsSubPage[];
+extern const char kCellularSettingsSubPage[];
 
 // Returns true if the sub-page is one of the above.
 bool IsOSSettingsSubPage(const std::string& sub_page);

components/arc/mojom/intent_helper.mojom

@@ -168,8 +168,10 @@ enum ChromePage {
   SWITCHACCESS,
   STYLUS,
   TETHERSETTINGS,
+  ETHERNET,
+  CELLULAR,
 
-  LAST = TETHERSETTINGS,
+  LAST = CELLULAR,
 };
 
 // Describes an unique chrome app.