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

Unified Diff: ash/common/system/chromeos/network/vpn_list_view.cc

Issue 2435903002: Move tray code from ui/chromeos/network/ (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
« no previous file with comments | « ash/common/system/chromeos/network/vpn_list_view.h ('k') | ash/resources/ash_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/network/vpn_list_view.cc
diff --git a/ash/common/system/chromeos/network/vpn_list_view.cc b/ash/common/system/chromeos/network/vpn_list_view.cc
index 77778dfce0b03763e58d6445e264e4efffa11cd1..47d1788074c2b8614757ddc5ed0a7377a6cd28e2 100644
--- a/ash/common/system/chromeos/network/vpn_list_view.cc
+++ b/ash/common/system/chromeos/network/vpn_list_view.cc
@@ -8,6 +8,10 @@
#include <utility>
#include <vector>
+#include "ash/common/system/chromeos/network/network_icon.h"
+#include "ash/common/system/chromeos/network/network_icon_animation.h"
+#include "ash/common/system/chromeos/network/network_icon_animation_observer.h"
+#include "ash/common/system/chromeos/network/network_list_delegate.h"
#include "ash/common/system/chromeos/network/vpn_delegate.h"
#include "ash/common/system/tray/hover_highlight_view.h"
#include "ash/common/system/tray/system_tray_delegate.h"
@@ -25,10 +29,6 @@
#include "chromeos/network/network_type_pattern.h"
#include "grit/ash_strings.h"
#include "ui/base/l10n/l10n_util.h"
-#include "ui/chromeos/network/network_icon.h"
-#include "ui/chromeos/network/network_icon_animation.h"
-#include "ui/chromeos/network/network_icon_animation_observer.h"
-#include "ui/chromeos/network/network_list_delegate.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/text_constants.h"
@@ -75,14 +75,14 @@ class VPNListProviderEntry : public VPNListEntryBase {
// network is currently connected, a disconnect button will be shown next to its
// name.
class VPNListNetworkEntry : public VPNListEntryBase,
- public ui::network_icon::AnimationObserver,
+ public network_icon::AnimationObserver,
public views::ButtonListener {
public:
VPNListNetworkEntry(VPNListView* parent,
const chromeos::NetworkState* network);
~VPNListNetworkEntry() override;
- // ui::network_icon::AnimationObserver:
+ // network_icon::AnimationObserver:
void NetworkIconChanged() override;
// views::ButtonListener:
@@ -137,7 +137,7 @@ VPNListNetworkEntry::VPNListNetworkEntry(VPNListView* parent,
}
VPNListNetworkEntry::~VPNListNetworkEntry() {
- ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
+ network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
}
void VPNListNetworkEntry::NetworkIconChanged() {
@@ -190,9 +190,9 @@ void VPNListNetworkEntry::DisconnectButton::OnBoundsChanged(
void VPNListNetworkEntry::UpdateFromNetworkState(
const chromeos::NetworkState* network) {
if (network && network->IsConnectingState())
- ui::network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this);
+ network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this);
else
- ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
+ network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
if (!network) {
// This is a transient state where the network has been removed already but
@@ -203,11 +203,10 @@ void VPNListNetworkEntry::UpdateFromNetworkState(
RemoveAllChildViews(true);
disconnect_button_ = nullptr;
- AddIconAndLabel(ui::network_icon::GetImageForNetwork(
- network, ui::network_icon::ICON_TYPE_LIST),
- ui::network_icon::GetLabelForNetwork(
- network, ui::network_icon::ICON_TYPE_LIST),
- IsConnectedOrConnecting(network));
+ AddIconAndLabel(
+ network_icon::GetImageForNetwork(network, network_icon::ICON_TYPE_LIST),
+ network_icon::GetLabelForNetwork(network, network_icon::ICON_TYPE_LIST),
+ IsConnectedOrConnecting(network));
if (IsConnectedOrConnecting(network)) {
disconnect_button_ = new DisconnectButton(this);
AddChildView(disconnect_button_);
@@ -230,8 +229,7 @@ void VPNListNetworkEntry::UpdateFromNetworkState(
} // namespace
-VPNListView::VPNListView(ui::NetworkListDelegate* delegate)
- : delegate_(delegate) {
+VPNListView::VPNListView(NetworkListDelegate* delegate) : delegate_(delegate) {
WmShell::Get()->system_tray_delegate()->GetVPNDelegate()->AddObserver(this);
}
« no previous file with comments | « ash/common/system/chromeos/network/vpn_list_view.h ('k') | ash/resources/ash_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698