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

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

Issue 693493003: Revert "Move network_connect code to ui/chromeos/network" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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: ash/system/chromeos/network/network_state_list_detailed_view.cc
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 3f334b58019a464997cf98b1bb3a36118033b1a4..ec5807c5e02c1597d015176f00dea0659fea0dca 100644
--- a/ash/system/chromeos/network/network_state_list_detailed_view.cc
+++ b/ash/system/chromeos/network/network_state_list_detailed_view.cc
@@ -10,6 +10,7 @@
#include "ash/shell.h"
#include "ash/shell_delegate.h"
#include "ash/shell_window_ids.h"
+#include "ash/system/chromeos/network/network_connect.h"
#include "ash/system/chromeos/network/tray_network_state_observer.h"
#include "ash/system/tray/fixed_sized_scroll_view.h"
#include "ash/system/tray/hover_highlight_view.h"
@@ -35,7 +36,6 @@
#include "ui/aura/window.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"
@@ -271,7 +271,7 @@ void NetworkStateListDetailedView::OnViewClicked(views::View* sender) {
list_type_ == LIST_TYPE_VPN ?
ash::UMA_STATUS_AREA_CONNECT_TO_VPN :
ash::UMA_STATUS_AREA_CONNECT_TO_CONFIGURED_NETWORK);
- ui::NetworkConnect::Get()->ConnectToNetwork(service_path);
+ ash::NetworkConnect::Get()->ConnectToNetwork(service_path);
}
}
@@ -587,8 +587,8 @@ void NetworkStateListDetailedView::ToggleMobile() {
NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
bool enabled =
handler->IsTechnologyEnabled(NetworkTypePattern::Mobile());
- ui::NetworkConnect::Get()->SetTechnologyEnabled(NetworkTypePattern::Mobile(),
- !enabled);
+ ash::NetworkConnect::Get()->SetTechnologyEnabled(NetworkTypePattern::Mobile(),
+ !enabled);
}
views::View* NetworkStateListDetailedView::CreateViewForNetwork(
« no previous file with comments | « ash/system/chromeos/network/network_connect.cc ('k') | ash/system/chromeos/network/network_state_notifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698