OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/update_screen.h" | 5 #include "chrome/browser/chromeos/login/update_screen.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "chrome/browser/chromeos/login/screen_observer.h" | 8 #include "chrome/browser/chromeos/login/screen_observer.h" |
9 #include "chrome/browser/chromeos/login/update_view.h" | 9 #include "chrome/browser/chromeos/login/update_view.h" |
10 | 10 |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 GoogleUpdateErrorCode error_code, | 42 GoogleUpdateErrorCode error_code, |
43 const std::wstring& version) { | 43 const std::wstring& version) { |
44 // Drop the last reference to the object so that it gets cleaned up here. | 44 // Drop the last reference to the object so that it gets cleaned up here. |
45 if (google_updater_.get()) { | 45 if (google_updater_.get()) { |
46 google_updater_->set_status_listener(NULL); | 46 google_updater_->set_status_listener(NULL); |
47 google_updater_ = NULL; | 47 google_updater_ = NULL; |
48 } | 48 } |
49 // Depending on the result decide what to do next. | 49 // Depending on the result decide what to do next. |
50 update_result_ = result; | 50 update_result_ = result; |
51 update_error_ = error_code; | 51 update_error_ = error_code; |
52 LOG(INFO) << "Update result: " << update_error_; | 52 LOG(INFO) << "Update result: " << result; |
| 53 if (error_code != GOOGLE_UPDATE_NO_ERROR) |
| 54 LOG(INFO) << "Update error code: " << error_code; |
| 55 LOG(INFO) << "Update version: " << version; |
53 switch (update_result_) { | 56 switch (update_result_) { |
54 case UPGRADE_IS_AVAILABLE: | 57 case UPGRADE_IS_AVAILABLE: |
55 checking_for_update_ = false; | 58 checking_for_update_ = false; |
56 // Advance view progress bar. | 59 // Advance view progress bar. |
57 view()->AddProgress(kUpdateCheckProgressIncrement); | 60 view()->AddProgress(kUpdateCheckProgressIncrement); |
58 // Create new Google Updater instance and install the update. | 61 // Create new Google Updater instance and install the update. |
59 google_updater_ = CreateGoogleUpdate(); | 62 google_updater_ = CreateGoogleUpdate(); |
60 google_updater_->CheckForUpdate(true, NULL); | 63 google_updater_->CheckForUpdate(true, NULL); |
61 LOG(INFO) << "Installing an update"; | 64 LOG(INFO) << "Installing an update"; |
62 break; | 65 break; |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 | 146 |
144 void UpdateScreen::OnMinimalUpdateTimeElapsed() { | 147 void UpdateScreen::OnMinimalUpdateTimeElapsed() { |
145 if (update_result_ == UPGRADE_SUCCESSFUL || | 148 if (update_result_ == UPGRADE_SUCCESSFUL || |
146 update_result_ == UPGRADE_ALREADY_UP_TO_DATE || | 149 update_result_ == UPGRADE_ALREADY_UP_TO_DATE || |
147 update_result_ == UPGRADE_ERROR) { | 150 update_result_ == UPGRADE_ERROR) { |
148 ExitUpdate(); | 151 ExitUpdate(); |
149 } | 152 } |
150 } | 153 } |
151 | 154 |
152 } // namespace chromeos | 155 } // namespace chromeos |
OLD | NEW |