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

Unified Diff: ash/system/network/tray_network.cc

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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: ash/system/network/tray_network.cc
diff --git a/ash/system/network/tray_network.cc b/ash/system/network/tray_network.cc
index a881de5160463128785fca46e9bd5d156d55315d..297ee10c5b06384d15be1713580919ff3a95c195 100644
--- a/ash/system/network/tray_network.cc
+++ b/ash/system/network/tray_network.cc
@@ -6,6 +6,7 @@
#include "ash/shelf/wm_shelf_util.h"
#include "ash/shell.h"
+#include "ash/shell_port.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/network/network_icon.h"
#include "ash/system/network/network_icon_animation.h"
@@ -20,7 +21,6 @@
#include "ash/system/tray/tray_item_view.h"
#include "ash/system/tray/tray_popup_item_style.h"
#include "ash/system/tray/tray_utils.h"
-#include "ash/wm_shell.h"
#include "base/command_line.h"
#include "base/strings/utf_string_conversions.h"
#include "chromeos/network/network_state.h"
@@ -263,7 +263,7 @@ views::View* TrayNetwork::CreateDefaultView(LoginStatus status) {
views::View* TrayNetwork::CreateDetailedView(LoginStatus status) {
CHECK(detailed_ == NULL);
- WmShell::Get()->RecordUserMetricsAction(
+ ShellPort::Get()->RecordUserMetricsAction(
UMA_STATUS_AREA_DETAILED_NETWORK_VIEW);
if (!chromeos::NetworkHandler::IsInitialized())
return NULL;
@@ -299,7 +299,7 @@ void TrayNetwork::RequestToggleWifi() {
}
NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
bool enabled = handler->IsTechnologyEnabled(NetworkTypePattern::WiFi());
- WmShell::Get()->RecordUserMetricsAction(
+ ShellPort::Get()->RecordUserMetricsAction(
enabled ? UMA_STATUS_AREA_DISABLE_WIFI : UMA_STATUS_AREA_ENABLE_WIFI);
handler->SetTechnologyEnabled(NetworkTypePattern::WiFi(), !enabled,
chromeos::network_handler::ErrorCallback());

Powered by Google App Engine
This is Rietveld 408576698