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

Unified Diff: chrome/browser/chromeos/mobile/mobile_activator.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: chrome/browser/chromeos/mobile/mobile_activator.cc
diff --git a/chrome/browser/chromeos/mobile/mobile_activator.cc b/chrome/browser/chromeos/mobile/mobile_activator.cc
index 1c7304a168040e47c13baa315b2e637767a504dc..6f019a521ff25c947facc8c9ec9ff561df46eef1 100644
--- a/chrome/browser/chromeos/mobile/mobile_activator.cc
+++ b/chrome/browser/chromeos/mobile/mobile_activator.cc
@@ -8,6 +8,7 @@
#include <map>
#include <string>
+#include "ash/system/chromeos/network/network_connect.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/files/file_util.h"
@@ -36,7 +37,6 @@
#include "chromeos/network/network_state_handler.h"
#include "content/public/browser/browser_thread.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
-#include "ui/chromeos/network/network_connect.h"
using content::BrowserThread;
@@ -624,7 +624,7 @@ void MobileActivator::ContinueConnecting() {
LOG(WARNING) << "Connect failed, will try again in a little bit.";
if (network) {
VLOG(1) << "Connecting to: " << network->path();
- ui::NetworkConnect::Get()->ConnectToNetwork(network->path());
+ ash::NetworkConnect::Get()->ConnectToNetwork(network->path());
}
}
}
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('k') | chrome/browser/chromeos/options/vpn_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698