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

Unified Diff: chrome/browser/chromeos/login/screens/update_screen.cc

Issue 212303003: Deleted switch '--disable-oobe-blocking-update' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chromeos/chromeos_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/screens/update_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/update_screen.cc b/chrome/browser/chromeos/login/screens/update_screen.cc
index 8e4b07a7a491d28434ad749532c2a28348ca44ae..64a9a1dead5c5a17dfeb52d87170599d81c3894f 100644
--- a/chrome/browser/chromeos/login/screens/update_screen.cc
+++ b/chrome/browser/chromeos/login/screens/update_screen.cc
@@ -70,12 +70,6 @@ void StartUpdateCallback(UpdateScreen* screen,
}
}
-// Returns true if blocking AU is enabled in command line.
-bool IsBlockingUpdateEnabledInCommandLine() {
- return !CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kDisableOOBEBlockingUpdate);
-}
-
} // anonymous namespace
// static
@@ -145,12 +139,10 @@ void UpdateScreen::UpdateStatusChanged(
actor_->SetProgress(kBeforeDownloadProgress);
actor_->ShowEstimatedTimeLeft(false);
if (!HasCriticalUpdate()) {
- LOG(INFO) << "Noncritical update available: "
- << status.new_version;
+ VLOG(1) << "Noncritical update available: " << status.new_version;
ExitUpdate(REASON_UPDATE_NON_CRITICAL);
} else {
- LOG(INFO) << "Critical update available: "
- << status.new_version;
+ VLOG(1) << "Critical update available: " << status.new_version;
actor_->SetProgressMessage(
UpdateScreenActor::PROGRESS_MESSAGE_UPDATE_AVAILABLE);
actor_->ShowProgressMessage(true);
@@ -170,12 +162,10 @@ void UpdateScreen::UpdateStatusChanged(
is_download_average_speed_computed_ = false;
download_average_speed_ = 0.0;
if (!HasCriticalUpdate()) {
- LOG(INFO) << "Non-critical update available: "
- << status.new_version;
+ VLOG(1) << "Non-critical update available: " << status.new_version;
ExitUpdate(REASON_UPDATE_NON_CRITICAL);
} else {
- LOG(INFO) << "Critical update available: "
- << status.new_version;
+ VLOG(1) << "Critical update available: " << status.new_version;
actor_->SetProgressMessage(
UpdateScreenActor::PROGRESS_MESSAGE_INSTALLING_UPDATE);
actor_->ShowProgressMessage(true);
@@ -285,8 +275,7 @@ void UpdateScreen::StartNetworkCheck() {
// If portal detector is enabled and portal detection before AU is
// allowed, initiate network state check. Otherwise, directly
// proceed to update.
- if (!NetworkPortalDetector::Get()->IsEnabled() ||
- !IsBlockingUpdateEnabledInCommandLine()) {
+ if (!NetworkPortalDetector::Get()->IsEnabled()) {
StartUpdateCheck();
return;
}
« no previous file with comments | « no previous file | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698