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

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

Issue 2897773002: Show proper message in about Chrome OS page (Closed)
Patch Set: Apply fix to patch set 3 Created 3 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 unified diff | Download patch
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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 bool IsBootstrappingMaster() { 210 bool IsBootstrappingMaster() {
211 return base::CommandLine::ForCurrentProcess()->HasSwitch( 211 return base::CommandLine::ForCurrentProcess()->HasSwitch(
212 chromeos::switches::kOobeBootstrappingMaster); 212 chromeos::switches::kOobeBootstrappingMaster);
213 } 213 }
214 214
215 bool NetworkAllowUpdate(const chromeos::NetworkState* network) { 215 bool NetworkAllowUpdate(const chromeos::NetworkState* network) {
216 if (!network || !network->IsConnectedState()) 216 if (!network || !network->IsConnectedState())
217 return false; 217 return false;
218 if (network->type() == shill::kTypeBluetooth || 218 if (network->type() == shill::kTypeBluetooth ||
219 (network->type() == shill::kTypeCellular && 219 (network->type() == shill::kTypeCellular &&
220 !help_utils_chromeos::IsUpdateOverCellularAllowed())) { 220 !help_utils_chromeos::IsUpdateOverCellularAllowed(
221 false /* interactive */))) {
221 return false; 222 return false;
222 } 223 }
223 return true; 224 return true;
224 } 225 }
225 226
226 } // namespace 227 } // namespace
227 228
228 namespace chromeos { 229 namespace chromeos {
229 230
230 // static 231 // static
(...skipping 1309 matching lines...) Expand 10 before | Expand all | Expand 10 after
1540 SetCurrentScreen(screen); 1541 SetCurrentScreen(screen);
1541 } 1542 }
1542 1543
1543 AutoEnrollmentController* WizardController::GetAutoEnrollmentController() { 1544 AutoEnrollmentController* WizardController::GetAutoEnrollmentController() {
1544 if (!auto_enrollment_controller_) 1545 if (!auto_enrollment_controller_)
1545 auto_enrollment_controller_ = base::MakeUnique<AutoEnrollmentController>(); 1546 auto_enrollment_controller_ = base::MakeUnique<AutoEnrollmentController>();
1546 return auto_enrollment_controller_.get(); 1547 return auto_enrollment_controller_.get();
1547 } 1548 }
1548 1549
1549 } // namespace chromeos 1550 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/resources/settings/about_page/about_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698