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

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

Issue 2624843003: Add support for cellular geolocation (Closed)
Patch Set: Update device tests to use correct dict key Created 3 years, 10 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 | chrome/browser/chromeos/policy/proto/chrome_device_policy.proto » ('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 874 matching lines...) Expand 10 before | Expand all | Expand 10 after
885 UpdateScreen::Get(this)->StartNetworkCheck(); 885 UpdateScreen::Get(this)->StartNetworkCheck();
886 } 886 }
887 887
888 void WizardController::StartTimezoneResolve() { 888 void WizardController::StartTimezoneResolve() {
889 geolocation_provider_.reset(new SimpleGeolocationProvider( 889 geolocation_provider_.reset(new SimpleGeolocationProvider(
890 g_browser_process->system_request_context(), 890 g_browser_process->system_request_context(),
891 SimpleGeolocationProvider::DefaultGeolocationProviderURL())); 891 SimpleGeolocationProvider::DefaultGeolocationProviderURL()));
892 geolocation_provider_->RequestGeolocation( 892 geolocation_provider_->RequestGeolocation(
893 base::TimeDelta::FromSeconds(kResolveTimeZoneTimeoutSeconds), 893 base::TimeDelta::FromSeconds(kResolveTimeZoneTimeoutSeconds),
894 false /* send_wifi_geolocation_data */, 894 false /* send_wifi_geolocation_data */,
895 false /* send_cellular_geolocation_data */,
895 base::Bind(&WizardController::OnLocationResolved, 896 base::Bind(&WizardController::OnLocationResolved,
896 weak_factory_.GetWeakPtr())); 897 weak_factory_.GetWeakPtr()));
897 } 898 }
898 899
899 void WizardController::PerformPostEulaActions() { 900 void WizardController::PerformPostEulaActions() {
900 DelayNetworkCall( 901 DelayNetworkCall(
901 base::TimeDelta::FromMilliseconds(kDefaultNetworkRetryDelayMS), 902 base::TimeDelta::FromMilliseconds(kDefaultNetworkRetryDelayMS),
902 base::Bind(&WizardController::StartTimezoneResolve, 903 base::Bind(&WizardController::StartTimezoneResolve,
903 weak_factory_.GetWeakPtr())); 904 weak_factory_.GetWeakPtr()));
904 DelayNetworkCall( 905 DelayNetworkCall(
(...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after
1492 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; 1493 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
1493 } 1494 }
1494 1495
1495 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1496 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1496 screen->SetParameters(effective_config, shark_controller_.get()); 1497 screen->SetParameters(effective_config, shark_controller_.get());
1497 SetStatusAreaVisible(true); 1498 SetStatusAreaVisible(true);
1498 SetCurrentScreen(screen); 1499 SetCurrentScreen(screen);
1499 } 1500 }
1500 1501
1501 } // namespace chromeos 1502 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/proto/chrome_device_policy.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698