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

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

Issue 2434683003: Move NetworkStateNotifier and NetworkConnect from src/ui (Closed)
Patch Set: Fix virtuals 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 | « no previous file | ash/common/system/system_notifier.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/network/network_state_list_detailed_view.cc
diff --git a/ash/common/system/chromeos/network/network_state_list_detailed_view.cc b/ash/common/system/chromeos/network/network_state_list_detailed_view.cc
index 287d1ba422dbbf128695993c628d0a581ed6a262..45771b3c6a3be8b1d5893ef052b21fa5ba5f3227 100644
--- a/ash/common/system/chromeos/network/network_state_list_detailed_view.cc
+++ b/ash/common/system/chromeos/network/network_state_list_detailed_view.cc
@@ -38,6 +38,7 @@
#include "chromeos/login/login_state.h"
#include "chromeos/network/device_state.h"
#include "chromeos/network/managed_network_configuration_handler.h"
+#include "chromeos/network/network_connect.h"
#include "chromeos/network/network_state.h"
#include "chromeos/network/network_state_handler.h"
#include "grit/ash_resources.h"
@@ -47,7 +48,6 @@
#include "ui/accessibility/ax_view_state.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
-#include "ui/chromeos/network/network_connect.h"
#include "ui/chromeos/network/network_icon.h"
#include "ui/chromeos/network/network_icon_animation.h"
#include "ui/chromeos/network/network_info.h"
@@ -467,7 +467,7 @@ void NetworkStateListDetailedView::HandleViewClicked(views::View* view) {
list_type_ == LIST_TYPE_VPN
? UMA_STATUS_AREA_CONNECT_TO_VPN
: UMA_STATUS_AREA_CONNECT_TO_CONFIGURED_NETWORK);
- ui::NetworkConnect::Get()->ConnectToNetwork(service_path);
+ chromeos::NetworkConnect::Get()->ConnectToNetwork(service_path);
}
owner()->system_tray()->CloseSystemBubble();
}
@@ -941,8 +941,8 @@ void NetworkStateListDetailedView::CallRequestScan() {
void NetworkStateListDetailedView::ToggleMobile() {
NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
bool enabled = handler->IsTechnologyEnabled(NetworkTypePattern::Mobile());
- ui::NetworkConnect::Get()->SetTechnologyEnabled(NetworkTypePattern::Mobile(),
- !enabled);
+ chromeos::NetworkConnect::Get()->SetTechnologyEnabled(
+ NetworkTypePattern::Mobile(), !enabled);
}
views::View* NetworkStateListDetailedView::CreateViewForNetwork(
« no previous file with comments | « no previous file | ash/common/system/system_notifier.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698