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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 1819173002: SimpleGeolocation should support sending WiFi AP data. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after review. Created 4 years, 9 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 unified diff | Download patch
« no previous file with comments | « no previous file | chromeos/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdlib.h> 9 #include <stdlib.h>
10 #include <sys/types.h> 10 #include <sys/types.h>
(...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after
775 SetCurrentScreenSmooth(GetScreen(kUpdateScreenName), true); 775 SetCurrentScreenSmooth(GetScreen(kUpdateScreenName), true);
776 UpdateScreen::Get(this)->StartNetworkCheck(); 776 UpdateScreen::Get(this)->StartNetworkCheck();
777 } 777 }
778 778
779 void WizardController::StartTimezoneResolve() { 779 void WizardController::StartTimezoneResolve() {
780 geolocation_provider_.reset(new SimpleGeolocationProvider( 780 geolocation_provider_.reset(new SimpleGeolocationProvider(
781 g_browser_process->system_request_context(), 781 g_browser_process->system_request_context(),
782 SimpleGeolocationProvider::DefaultGeolocationProviderURL())); 782 SimpleGeolocationProvider::DefaultGeolocationProviderURL()));
783 geolocation_provider_->RequestGeolocation( 783 geolocation_provider_->RequestGeolocation(
784 base::TimeDelta::FromSeconds(kResolveTimeZoneTimeoutSeconds), 784 base::TimeDelta::FromSeconds(kResolveTimeZoneTimeoutSeconds),
785 false /* send_wifi_geolocation_data */,
785 base::Bind(&WizardController::OnLocationResolved, 786 base::Bind(&WizardController::OnLocationResolved,
786 weak_factory_.GetWeakPtr())); 787 weak_factory_.GetWeakPtr()));
787 } 788 }
788 789
789 void WizardController::PerformPostEulaActions() { 790 void WizardController::PerformPostEulaActions() {
790 DelayNetworkCall( 791 DelayNetworkCall(
791 base::TimeDelta::FromMilliseconds(kDefaultNetworkRetryDelayMS), 792 base::TimeDelta::FromMilliseconds(kDefaultNetworkRetryDelayMS),
792 base::Bind(&WizardController::StartTimezoneResolve, 793 base::Bind(&WizardController::StartTimezoneResolve,
793 weak_factory_.GetWeakPtr())); 794 weak_factory_.GetWeakPtr()));
794 DelayNetworkCall( 795 DelayNetworkCall(
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
1357 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; 1358 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
1358 } 1359 }
1359 1360
1360 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1361 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1361 screen->SetParameters(effective_config, shark_controller_.get()); 1362 screen->SetParameters(effective_config, shark_controller_.get());
1362 SetStatusAreaVisible(true); 1363 SetStatusAreaVisible(true);
1363 SetCurrentScreen(screen); 1364 SetCurrentScreen(screen);
1364 } 1365 }
1365 1366
1366 } // namespace chromeos 1367 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chromeos/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698