Fixed channel switch when user decides to switch to another channel in

chrome/browser/ui/webui/help/version_updater_chromeos.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/help/version_updater_chromeos.h"
 
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 54 matching lines @@
   chromeos::CrosSettings* settings = chromeos::CrosSettings::Get();
   if (!settings)
     return update_disabled;
   const base::Value* update_disabled_value =
       settings->GetPref(chromeos::kUpdateDisabled);
   if (update_disabled_value)
     CHECK(update_disabled_value->GetAsBoolean(&update_disabled));
   return update_disabled;
 }
 
-// Returns whether an update is allowed. If not, it calls the callback with
-// the appropriate status.
-bool EnsureCanUpdate(const VersionUpdater::StatusCallback& callback) {
-  if (IsAutoUpdateDisabled()) {
-    callback.Run(VersionUpdater::FAILED, 0,
-                 l10n_util::GetStringUTF16(IDS_UPGRADE_DISABLED_BY_POLICY));
-    return false;
-  }
-
-  chromeos::NetworkStateHandler* network_state_handler =
-      chromeos::NetworkHandler::Get()->network_state_handler();
-  const chromeos::NetworkState* network =
-      network_state_handler->DefaultNetwork();
-
-  // Don't allow an update if we're currently offline or connected
-  // to a network for which updates are disallowed.
-  NetworkStatus status = GetNetworkStatus(network);
-  if (status == NETWORK_STATUS_OFFLINE) {
-    callback.Run(VersionUpdater::FAILED_OFFLINE, 0,
-                  l10n_util::GetStringUTF16(IDS_UPGRADE_OFFLINE));
-    return false;
-  } else if (status == NETWORK_STATUS_DISALLOWED) {
-    base::string16 message =
-        l10n_util::GetStringFUTF16(
-            IDS_UPGRADE_DISALLOWED,
-            help_utils_chromeos::GetConnectionTypeAsUTF16(network->type()));
-    callback.Run(VersionUpdater::FAILED_CONNECTION_TYPE_DISALLOWED, 0, message);
-    return false;
-  }
-
-  return true;
-}
-
 }  // namespace
 
 VersionUpdater* VersionUpdater::Create() {
   return new VersionUpdaterCros;
 }
 
 void VersionUpdaterCros::GetUpdateStatus(const StatusCallback& callback) {
   callback_ = callback;
   if (!EnsureCanUpdate(callback))

[James Hawkins, 2014/09/22 20:23:08]

this->EnsureCanUpdate, right?

[ygorshenin1, 2014/09/23 10:23:16]

Could you please explain a difference between a direct call and a call via
'this' pointer in this case?

On 2014/09/22 20:23:08, James Hawkins wrote:

     return;
 
   UpdateEngineClient* update_engine_client =
       DBusThreadManager::Get()->GetUpdateEngineClient();
   if (!update_engine_client->HasObserver(this))
     update_engine_client->AddObserver(this);
 
   this->UpdateStatusChanged(
       DBusThreadManager::Get()->GetUpdateEngineClient()->GetLastStatus());
 }
 
 void VersionUpdaterCros::CheckForUpdate(const StatusCallback& callback) {
   callback_ = callback;
 
   if (!EnsureCanUpdate(callback))
     return;
 
   UpdateEngineClient* update_engine_client =
       DBusThreadManager::Get()->GetUpdateEngineClient();
   if (!update_engine_client->HasObserver(this))
     update_engine_client->AddObserver(this);
 
+  if (update_engine_client->GetLastStatus().status !=
+      UpdateEngineClient::UPDATE_STATUS_IDLE) {
+    check_for_update_when_idle_ = true;
+    return;
+  }
+  check_for_update_when_idle_ = false;
+
   // Make sure that libcros is loaded and OOBE is complete.
   if (!WizardController::default_controller() ||
       chromeos::StartupUtils::IsDeviceRegistered()) {
-    update_engine_client->RequestUpdateCheck(
-        base::Bind(&VersionUpdaterCros::OnUpdateCheck,
-                   weak_ptr_factory_.GetWeakPtr()));
+    update_engine_client->RequestUpdateCheck(base::Bind(
+        &VersionUpdaterCros::OnUpdateCheck, weak_ptr_factory_.GetWeakPtr()));
   }
 }
 
 void VersionUpdaterCros::RelaunchBrowser() const {
   DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart();
 }
 
 void VersionUpdaterCros::SetChannel(const std::string& channel,
                                     bool is_powerwash_allowed) {
   if (user_manager::UserManager::Get()->IsCurrentUserOwner()) {
     // For local owner set the field in the policy blob.
     CrosSettings::Get()->SetString(chromeos::kReleaseChannel, channel);
   }
   DBusThreadManager::Get()->GetUpdateEngineClient()->
       SetChannel(channel, is_powerwash_allowed);
 }
 
 void VersionUpdaterCros::GetChannel(bool get_current_channel,
                                     const ChannelCallback& cb) {
   UpdateEngineClient* update_engine_client =
       DBusThreadManager::Get()->GetUpdateEngineClient();
 
   // Request the channel information.
   update_engine_client->GetChannel(get_current_channel, cb);
 }
 
 VersionUpdaterCros::VersionUpdaterCros()
     : last_operation_(UpdateEngineClient::UPDATE_STATUS_IDLE),
+      check_for_update_when_idle_(false),
       weak_ptr_factory_(this) {
 }
 
 VersionUpdaterCros::~VersionUpdaterCros() {
   UpdateEngineClient* update_engine_client =
       DBusThreadManager::Get()->GetUpdateEngineClient();
   update_engine_client->RemoveObserver(this);
 }
 
+bool VersionUpdaterCros::EnsureCanUpdate(const StatusCallback& callback) {
+  if (IsAutoUpdateDisabled()) {
+    callback.Run(VersionUpdater::FAILED, 0,
+                 l10n_util::GetStringUTF16(IDS_UPGRADE_DISABLED_BY_POLICY));
+    return false;
+  }
+
+  chromeos::NetworkStateHandler* network_state_handler =
+      chromeos::NetworkHandler::Get()->network_state_handler();
+  const chromeos::NetworkState* network =
+      network_state_handler->DefaultNetwork();
+
+  // Don't allow an update if we're currently offline or connected
+  // to a network for which updates are disallowed.
+  NetworkStatus status = GetNetworkStatus(network);
+  if (status == NETWORK_STATUS_OFFLINE) {
+    callback.Run(VersionUpdater::FAILED_OFFLINE, 0,
+                  l10n_util::GetStringUTF16(IDS_UPGRADE_OFFLINE));
+    return false;
+  } else if (status == NETWORK_STATUS_DISALLOWED) {
+    base::string16 message =
+        l10n_util::GetStringFUTF16(
+            IDS_UPGRADE_DISALLOWED,
+            help_utils_chromeos::GetConnectionTypeAsUTF16(network->type()));
+    callback.Run(VersionUpdater::FAILED_CONNECTION_TYPE_DISALLOWED, 0, message);
+    return false;
+  }
+
+  return true;
+}
+
 void VersionUpdaterCros::UpdateStatusChanged(
     const UpdateEngineClient::Status& status) {
   Status my_status = UPDATED;
   int progress = 0;
   base::string16 message;
 
   // If the updater is currently idle, just show the last operation (unless it
   // was previously checking for an update -- in that case, the system is
   // up-to-date now).  See http://crbug.com/120063 for details.
   UpdateEngineClient::UpdateStatusOperation operation_to_show = status.status;
@@ skipping 30 matching lines @@
       break;
     case UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT:
       my_status = NEARLY_UPDATED;
       break;
     default:
       break;
   }
 
   callback_.Run(my_status, progress, message);
   last_operation_ = status.status;
+
+  if (check_for_update_when_idle_ &&
+      status.status == UpdateEngineClient::UPDATE_STATUS_IDLE) {
+    CheckForUpdate(callback_);
+  }
 }
 
 void VersionUpdaterCros::OnUpdateCheck(
     UpdateEngineClient::UpdateCheckResult result) {
   // If version updating is not implemented, this binary is the most up-to-date
   // possible with respect to automatic updating.
   if (result == UpdateEngineClient::UPDATE_RESULT_NOTIMPLEMENTED)
     callback_.Run(UPDATED, 0, base::string16());
 }