| Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| index 4beb21c9bc617bfecc52d66169daacb22459d668..48226999bfcb2c3f01fa61b05cba1741fd8a9f83 100644
|
| --- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| +++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| @@ -106,7 +106,6 @@
|
| #include "device/bluetooth/bluetooth_adapter.h"
|
| #include "device/bluetooth/bluetooth_adapter_factory.h"
|
| #include "device/bluetooth/bluetooth_device.h"
|
| -#include "net/base/escape.h"
|
| #include "third_party/cros_system_api/dbus/service_constants.h"
|
| #include "ui/base/ime/chromeos/extension_ime_util.h"
|
| #include "ui/base/ime/chromeos/ime_keyboard.h"
|
| @@ -402,20 +401,6 @@ void SystemTrayDelegateChromeOS::ShowSetTimeDialog() {
|
| SetTimeDialog::ShowDialog(GetNativeWindow());
|
| }
|
|
|
| -void SystemTrayDelegateChromeOS::ShowNetworkSettingsForGuid(
|
| - const std::string& guid) {
|
| - // TODO(mash): Refactor out SessionStateDelegate and move to SystemTrayClient.
|
| - ash::WmShell* wm_shell = ash::WmShell::Get();
|
| - if (LoginState::Get()->IsUserLoggedIn() &&
|
| - !wm_shell->GetSessionStateDelegate()->IsInSecondaryLoginScreen()) {
|
| - std::string page = chrome::kInternetOptionsSubPage;
|
| - if (!guid.empty())
|
| - page += "?guid=" + net::EscapeUrlEncodedData(guid, true);
|
| - content::RecordAction(base::UserMetricsAction("OpenInternetOptionsDialog"));
|
| - ShowSettingsSubPageForActiveUser(page);
|
| - }
|
| -}
|
| -
|
| bool SystemTrayDelegateChromeOS::ShouldShowDisplayNotification() {
|
| // Packaged app is not counted as 'last active', so if a browser opening the
|
| // display settings is in background of a packaged app, it will return true.
|
|
|