Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1996)

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 2396863004: chromeos: Refactor system tray ShowNetworkSettingsForGuid for mash (Closed)
Patch Set: rebase Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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.

Powered by Google App Engine
This is Rietveld 408576698