MD Settings: Fix subpage URLS for CrOS

chrome/browser/ui/ash/system_tray_client.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/system_tray_client.h"
 
 #include "ash/common/login_status.h"
 #include "ash/common/wm_shell.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
+#include "base/feature_list.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/set_time_dialog.h"
 #include "chrome/browser/chromeos/system/system_clock.h"
 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/upgrade_detector.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/common/url_constants.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/login/login_state.h"
 #include "components/session_manager/core/session_manager.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/service_manager_connection.h"
 #include "extensions/browser/api/vpn_provider/vpn_service.h"
 #include "extensions/browser/api/vpn_provider/vpn_service_factory.h"
 #include "net/base/escape.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "third_party/cros_system_api/dbus/shill/dbus-constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
 using chromeos::DBusThreadManager;
 using chromeos::LoginState;
 using views::Widget;
 
 namespace {
 
-const char kDisplaySettingsSubPageName[] = "display";
-const char kPaletteSettingsSubPageName[] = "stylus-overlay";
-
 SystemTrayClient* g_instance = nullptr;
 
 void ShowSettingsSubPageForActiveUser(const std::string& sub_page) {
   chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(),
                                         sub_page);
 }
 
 // Returns the severity of a pending Chrome / Chrome OS update.
 ash::mojom::UpdateSeverity GetUpdateSeverity(UpgradeDetector* detector) {
   switch (detector->upgrade_notification_stage()) {
@@ skipping 151 matching lines @@
   chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(),
                                         chrome::kDateTimeSubPage);
 }
 
 void SystemTrayClient::ShowSetTimeDialog() {
   chromeos::SetTimeDialog::ShowDialogInContainer(GetDialogParentContainerId());
 }
 
 void SystemTrayClient::ShowDisplaySettings() {
   content::RecordAction(base::UserMetricsAction("ShowDisplayOptions"));
-  ShowSettingsSubPageForActiveUser(kDisplaySettingsSubPageName);
+  ShowSettingsSubPageForActiveUser(chrome::kDisplaySubPage);
 }
 
 void SystemTrayClient::ShowPowerSettings() {
   content::RecordAction(base::UserMetricsAction("Tray_ShowPowerOptions"));
-  ShowSettingsSubPageForActiveUser(chrome::kPowerOptionsSubPage);
+  ShowSettingsSubPageForActiveUser(chrome::kPowerSubPage);
 }
 
 void SystemTrayClient::ShowChromeSlow() {
   chrome::ScopedTabbedBrowserDisplayer displayer(
       ProfileManager::GetPrimaryUserProfile());
   chrome::ShowSlow(displayer.browser());
 }
 
 void SystemTrayClient::ShowIMESettings() {
   content::RecordAction(base::UserMetricsAction("OpenLanguageOptionsDialog"));
@@ skipping 18 matching lines @@
 
 void SystemTrayClient::ShowPaletteHelp() {
   chrome::ScopedTabbedBrowserDisplayer displayer(
       ProfileManager::GetActiveUserProfile());
   chrome::ShowSingletonTab(displayer.browser(),
                            GURL(chrome::kChromePaletteHelpURL));
 }
 
 void SystemTrayClient::ShowPaletteSettings() {
   content::RecordAction(base::UserMetricsAction("ShowPaletteOptions"));
-  ShowSettingsSubPageForActiveUser(kPaletteSettingsSubPageName);
+  ShowSettingsSubPageForActiveUser(chrome::kStylusSubPage);
 }
 
 void SystemTrayClient::ShowPublicAccountInfo() {
   chrome::ScopedTabbedBrowserDisplayer displayer(
       ProfileManager::GetActiveUserProfile());
   chrome::ShowPolicy(displayer.browser());
 }
 
 void SystemTrayClient::ShowNetworkConfigure(const std::string& network_id) {
   // UI is not available at the lock screen.
@@ skipping 30 matching lines @@
   chromeos::VpnServiceFactory::GetForBrowserContext(profile)
       ->SendShowAddDialogToExtension(extension_id);
 }
 
 void SystemTrayClient::ShowNetworkSettings(const std::string& network_id) {
   if (!LoginState::Get()->IsUserLoggedIn() ||
       session_manager::SessionManager::Get()->IsInSecondaryLoginScreen()) {
     return;
   }
 
-  std::string page = chrome::kInternetOptionsSubPage;
-  if (!network_id.empty())
+  std::string page = chrome::kInternetSubPage;
+  if (!network_id.empty()) {
+    if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings))
+      page = chrome::kNetworkDetailSubPage;
     page += "?guid=" + net::EscapeUrlEncodedData(network_id, true);
+  }
   content::RecordAction(base::UserMetricsAction("OpenInternetOptionsDialog"));
   ShowSettingsSubPageForActiveUser(page);
 }
 
 void SystemTrayClient::ShowProxySettings() {
   LoginState* login_state = LoginState::Get();
   // User is not logged in.
   CHECK(!login_state->IsUserLoggedIn() ||
         login_state->GetLoggedInUserType() == LoginState::LOGGED_IN_USER_NONE);
   chromeos::LoginDisplayHost::default_host()->OpenProxySettings();
@@ skipping 34 matching lines @@
     chromeos::system::SystemClock* clock) {
   system_tray_->SetUse24HourClock(clock->ShouldUse24HourClock());
 }
 
 void SystemTrayClient::Observe(int type,
                                const content::NotificationSource& source,
                                const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_UPGRADE_RECOMMENDED, type);
   HandleUpdateAvailable();
 }