summaryrefslogtreecommitdiffstats
path: root/ash/system/chromeos
diff options
context:
space:
mode:
Diffstat (limited to 'ash/system/chromeos')
-rw-r--r--ash/system/chromeos/network/network_list_detailed_view_base.cc10
-rw-r--r--ash/system/chromeos/network/network_state_list_detailed_view.cc6
-rw-r--r--ash/system/chromeos/network/tray_network.cc22
-rw-r--r--ash/system/chromeos/network/tray_vpn.cc8
-rw-r--r--ash/system/chromeos/tray_display.cc2
5 files changed, 24 insertions, 24 deletions
diff --git a/ash/system/chromeos/network/network_list_detailed_view_base.cc b/ash/system/chromeos/network/network_list_detailed_view_base.cc
index 3a8c087..decb77c 100644
--- a/ash/system/chromeos/network/network_list_detailed_view_base.cc
+++ b/ash/system/chromeos/network/network_list_detailed_view_base.cc
@@ -102,7 +102,7 @@ NetworkListDetailedViewBase::~NetworkListDetailedViewBase() {
void NetworkListDetailedViewBase::Init() {
CreateItems();
Update();
- Shell::GetInstance()->tray_delegate()->RequestNetworkScan();
+ Shell::GetInstance()->system_tray_delegate()->RequestNetworkScan();
}
NetworkDetailedView::DetailedViewType
@@ -187,7 +187,7 @@ void NetworkListDetailedViewBase::AppendInfoButtonToHeader() {
void NetworkListDetailedViewBase::UpdateSettingButton() {
if (proxy_settings_) {
proxy_settings_->SetEnabled(
- Shell::GetInstance()->tray_delegate()->IsNetworkConnected());
+ Shell::GetInstance()->system_tray_delegate()->IsNetworkConnected());
}
}
@@ -301,7 +301,7 @@ void NetworkListDetailedViewBase::ButtonPressed(views::Button* sender,
// on.
ResetInfoBubble();
ash::SystemTrayDelegate* delegate =
- ash::Shell::GetInstance()->tray_delegate();
+ ash::Shell::GetInstance()->system_tray_delegate();
if (sender == settings_)
delegate->ShowNetworkSettings();
else if (sender == proxy_settings_)
@@ -312,7 +312,7 @@ void NetworkListDetailedViewBase::ButtonPressed(views::Button* sender,
void NetworkListDetailedViewBase::ClickedOn(views::View* sender) {
ash::SystemTrayDelegate* delegate =
- ash::Shell::GetInstance()->tray_delegate();
+ ash::Shell::GetInstance()->system_tray_delegate();
// If the info bubble was visible, close it when some other item is clicked
// on.
ResetInfoBubble();
@@ -352,7 +352,7 @@ void NetworkListDetailedViewBase::CreateSettingsEntry() {
views::View* NetworkListDetailedViewBase::CreateNetworkInfoView() {
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
std::string ip_address, ethernet_address, wifi_address;
- Shell::GetInstance()->tray_delegate()->GetNetworkAddresses(
+ Shell::GetInstance()->system_tray_delegate()->GetNetworkAddresses(
&ip_address, &ethernet_address, &wifi_address);
views::View* container = new views::View;
diff --git a/ash/system/chromeos/network/network_state_list_detailed_view.cc b/ash/system/chromeos/network/network_state_list_detailed_view.cc
index b28f72e..65f489f 100644
--- a/ash/system/chromeos/network/network_state_list_detailed_view.cc
+++ b/ash/system/chromeos/network/network_state_list_detailed_view.cc
@@ -186,7 +186,7 @@ void NetworkStateListDetailedView::ButtonPressed(views::Button* sender,
chromeos::NetworkStateHandler* handler = chromeos::NetworkStateHandler::Get();
ash::SystemTrayDelegate* delegate =
- ash::Shell::GetInstance()->tray_delegate();
+ ash::Shell::GetInstance()->system_tray_delegate();
if (sender == button_wifi_) {
bool enabled = handler->TechnologyEnabled(flimflam::kTypeWifi);
handler->SetTechnologyEnabled(
@@ -228,7 +228,7 @@ void NetworkStateListDetailedView::ClickedOn(views::View* sender) {
return;
ash::SystemTrayDelegate* delegate =
- ash::Shell::GetInstance()->tray_delegate();
+ ash::Shell::GetInstance()->system_tray_delegate();
if (sender == view_mobile_account_) {
delegate->ShowCellularURL(topup_url_);
} else if (sender == setup_mobile_account_) {
@@ -475,7 +475,7 @@ void NetworkStateListDetailedView::UpdateNetworkEntries() {
// TODO(stevenjb): Migrate this code to src/chromeos.
std::string carrier_id, topup_url, setup_url;
- if (Shell::GetInstance()->tray_delegate()->
+ if (Shell::GetInstance()->system_tray_delegate()->
GetCellularCarrierInfo(&carrier_id, &topup_url, &setup_url)) {
if (carrier_id != carrier_id_) {
carrier_id_ = carrier_id;
diff --git a/ash/system/chromeos/network/tray_network.cc b/ash/system/chromeos/network/tray_network.cc
index 663fd2d..ba4b833 100644
--- a/ash/system/chromeos/network/tray_network.cc
+++ b/ash/system/chromeos/network/tray_network.cc
@@ -103,7 +103,7 @@ class NetworkTrayView : public TrayItemView {
AddChildView(image_view_);
NetworkIconInfo info;
- Shell::GetInstance()->tray_delegate()->
+ Shell::GetInstance()->system_tray_delegate()->
GetMostRelevantNetworkIcon(&info, false);
Update(info);
}
@@ -158,7 +158,7 @@ class NetworkDefaultView : public TrayItemMore {
void Update() {
NetworkIconInfo info;
- Shell::GetInstance()->tray_delegate()->
+ Shell::GetInstance()->system_tray_delegate()->
GetMostRelevantNetworkIcon(&info, true);
SetImage(&info.image);
SetLabel(info.description);
@@ -219,7 +219,7 @@ class NetworkListDetailedView : public NetworkListDetailedViewBase {
}
virtual void UpdateHeaderButtons() OVERRIDE {
- SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
+ SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
button_wifi_->SetToggled(!delegate->GetWifiEnabled());
button_mobile_->SetToggled(!delegate->GetMobileEnabled());
button_mobile_->SetVisible(delegate->GetMobileAvailable());
@@ -248,7 +248,7 @@ class NetworkListDetailedView : public NetworkListDetailedViewBase {
virtual void GetAvailableNetworkList(
std::vector<NetworkIconInfo>* list) OVERRIDE {
- Shell::GetInstance()->tray_delegate()->GetAvailableNetworks(list);
+ Shell::GetInstance()->system_tray_delegate()->GetAvailableNetworks(list);
}
virtual void RefreshNetworkScrollWithEmptyNetworkList() OVERRIDE {
@@ -256,9 +256,9 @@ class NetworkListDetailedView : public NetworkListDetailedViewBase {
HoverHighlightView* container = new HoverHighlightView(this);
container->set_fixed_height(kTrayPopupItemHeight);
- if (Shell::GetInstance()->tray_delegate()->GetWifiEnabled()) {
+ if (Shell::GetInstance()->system_tray_delegate()->GetWifiEnabled()) {
NetworkIconInfo info;
- Shell::GetInstance()->tray_delegate()->
+ Shell::GetInstance()->system_tray_delegate()->
GetMostRelevantNetworkIcon(&info, true);
container->AddIconAndLabel(info.image,
info.description,
@@ -287,7 +287,7 @@ class NetworkListDetailedView : public NetworkListDetailedViewBase {
return;
std::string carrier_id, topup_url, setup_url;
- if (Shell::GetInstance()->tray_delegate()->
+ if (Shell::GetInstance()->system_tray_delegate()->
GetCellularCarrierInfo(&carrier_id,
&topup_url,
&setup_url)) {
@@ -327,7 +327,7 @@ class NetworkListDetailedView : public NetworkListDetailedViewBase {
if (login() == user::LOGGED_IN_LOCKED)
return;
- SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
+ SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
if (IsNetworkListEmpty() && !delegate->GetWifiEnabled()) {
turn_on_wifi_->SetVisible(true);
other_wifi_->SetVisible(false);
@@ -347,7 +347,7 @@ class NetworkListDetailedView : public NetworkListDetailedViewBase {
virtual void CustomButtonPressed(views::Button* sender,
const ui::Event& event) OVERRIDE {
ash::SystemTrayDelegate* delegate =
- ash::Shell::GetInstance()->tray_delegate();
+ ash::Shell::GetInstance()->system_tray_delegate();
if (sender == button_wifi_)
delegate->ToggleWifi();
else if (sender == button_mobile_)
@@ -364,7 +364,7 @@ class NetworkListDetailedView : public NetworkListDetailedViewBase {
virtual bool CustomLinkClickedOn(views::View* sender) OVERRIDE {
ash::SystemTrayDelegate* delegate =
- ash::Shell::GetInstance()->tray_delegate();
+ ash::Shell::GetInstance()->system_tray_delegate();
if (sender == view_mobile_account_) {
delegate->ShowCellularURL(topup_url_);
return true;
@@ -594,7 +594,7 @@ views::View* TrayNetwork::CreateDetailedView(user::LoginStatus status) {
messages_->messages().clear();
HideNotificationView();
if (request_wifi_view_) {
- SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
+ SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
// The Wi-Fi state is not toggled yet at this point.
detailed_ = new tray::NetworkWifiDetailedView(this,
!delegate->GetWifiEnabled());
diff --git a/ash/system/chromeos/network/tray_vpn.cc b/ash/system/chromeos/network/tray_vpn.cc
index 7733390..ea224a0 100644
--- a/ash/system/chromeos/network/tray_vpn.cc
+++ b/ash/system/chromeos/network/tray_vpn.cc
@@ -29,7 +29,7 @@ class VpnDefaultView : public TrayItemMore {
void Update() {
NetworkIconInfo info;
- Shell::GetInstance()->tray_delegate()->GetVirtualNetworkIcon(&info);
+ Shell::GetInstance()->system_tray_delegate()->GetVirtualNetworkIcon(&info);
SetImage(&info.image);
SetLabel(info.description);
SetAccessibleName(info.description);
@@ -66,7 +66,7 @@ class VpnListDetailedView : public NetworkListDetailedViewBase {
virtual void GetAvailableNetworkList(
std::vector<NetworkIconInfo>* list) OVERRIDE{
- Shell::GetInstance()->tray_delegate()->GetVirtualNetworks(list);
+ Shell::GetInstance()->system_tray_delegate()->GetVirtualNetworks(list);
}
virtual void RefreshNetworkScrollWithEmptyNetworkList() OVERRIDE {
@@ -102,7 +102,7 @@ class VpnListDetailedView : public NetworkListDetailedViewBase {
virtual void CustomButtonPressed(views::Button* sender,
const ui::Event& event) OVERRIDE {
if (sender == other_vpn_)
- ash::Shell::GetInstance()->tray_delegate()->ShowOtherVPN();
+ ash::Shell::GetInstance()->system_tray_delegate()->ShowOtherVPN();
else
NOTREACHED();
}
@@ -141,7 +141,7 @@ views::View* TrayVPN::CreateDefaultView(user::LoginStatus status) {
// Do not show VPN line in uber tray bubble if VPN is not configured.
std::vector<NetworkIconInfo> list;
- Shell::GetInstance()->tray_delegate()->GetVirtualNetworks(&list);
+ Shell::GetInstance()->system_tray_delegate()->GetVirtualNetworks(&list);
if (list.size() == 0)
return NULL;
diff --git a/ash/system/chromeos/tray_display.cc b/ash/system/chromeos/tray_display.cc
index ea0edf2..51c1f33 100644
--- a/ash/system/chromeos/tray_display.cc
+++ b/ash/system/chromeos/tray_display.cc
@@ -102,7 +102,7 @@ class DisplayView : public ash::internal::ActionableView {
if (login_status_ == ash::user::LOGGED_IN_USER ||
login_status_ == ash::user::LOGGED_IN_OWNER ||
login_status_ == ash::user::LOGGED_IN_GUEST) {
- ash::Shell::GetInstance()->tray_delegate()->ShowDisplaySettings();
+ ash::Shell::GetInstance()->system_tray_delegate()->ShowDisplaySettings();
}
return true;
generated by cgit v1.1 at 2025-05-12 04:06:16 +0000