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

Unified Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 15899015: Add CheckPortalList manager property to NetworkStateHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: force manager property update in shill manager client stub implementation Created 7 years, 7 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/login/wizard_controller.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 41b9dc3b4fb292df326ac208118f8dd889998e31..09bef9bf9bca6b742c6d396c09261e36aa280cbd 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -23,8 +23,6 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/app_mode/kiosk_app_launcher.h"
#include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros/network_library.h"
#include "chrome/browser/chromeos/customization_document.h"
#include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
#include "chrome/browser/chromeos/login/existing_user_controller.h"
@@ -57,6 +55,7 @@
#include "chromeos/chromeos_constants.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/session_manager_client.h"
+#include "chromeos/network/network_state_handler.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_source.h"
@@ -609,8 +608,8 @@ void WizardController::InitiateOOBEUpdate() {
void WizardController::PerformPostEulaActions() {
// Now that EULA has been accepted (for official builds), enable portal check.
// ChromiumOS builds would go though this code path too.
- chromeos::CrosLibrary::Get()->GetNetworkLibrary()->
- SetDefaultCheckPortalList();
+ NetworkHandler::Get()->network_state_handler()->SetCheckPortalList(
+ NetworkStateHandler::kDefaultCheckPortalList);
host_->CheckForAutoEnrollment();
NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance();
if (NetworkPortalDetector::IsEnabledInCommandLine() && detector)

Powered by Google App Engine
This is Rietveld 408576698