Start removing deprecated Options UI code

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/login_status.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/interfaces/constants.mojom.h"
 #include "ash/shell.h"
@@ skipping 397 matching lines @@
 
 void SystemTrayClient::ShowNetworkSettingsHelper(const std::string& network_id,
                                                  bool show_configure) {
   if (!LoginState::Get()->IsUserLoggedIn() ||
       session_manager::SessionManager::Get()->IsInSecondaryLoginScreen()) {
     return;
   }
 
   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);
+    page = chrome::kNetworkDetailSubPage + "?guid=" + net::EscapeUrlEncodedData(network_id, true);

[dpapad, 2017/06/01 00:12:54]

Nit: This seems more than 80 columns.

[Dan Beam, 2017/06/03 00:11:02]

Done.

     if (show_configure)
       page += "&showConfigure=true";
   }
   base::RecordAction(base::UserMetricsAction("OpenInternetOptionsDialog"));
   ShowSettingsSubPageForActiveUser(page);
 }
 
 void SystemTrayClient::ShowProxySettings() {
   LoginState* login_state = LoginState::Get();
   // User is not logged in.
@@ skipping 83 matching lines @@
   if (enterprise_domain == last_enterprise_domain_ &&
       active_directory_managed == last_active_directory_managed_) {
     return;
   }
   // Send to ash, which will add an item to the system tray.
   system_tray_->SetEnterpriseDomain(enterprise_domain,
                                     active_directory_managed);
   last_enterprise_domain_ = enterprise_domain;
   last_active_directory_managed_ = active_directory_managed;
 }