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

Side by Side Diff: chromeos/dbus/update_engine_client.cc

Issue 309533006: Added processing for a lost status to UpdateEngineClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Switch fixed. Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « chromeos/dbus/update_engine_client.h ('k') | no next file » | 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 "chromeos/dbus/update_engine_client.h" 5 #include "chromeos/dbus/update_engine_client.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 if (str == update_engine::kUpdateStatusDownloading) 47 if (str == update_engine::kUpdateStatusDownloading)
48 return UpdateEngineClient::UPDATE_STATUS_DOWNLOADING; 48 return UpdateEngineClient::UPDATE_STATUS_DOWNLOADING;
49 if (str == update_engine::kUpdateStatusVerifying) 49 if (str == update_engine::kUpdateStatusVerifying)
50 return UpdateEngineClient::UPDATE_STATUS_VERIFYING; 50 return UpdateEngineClient::UPDATE_STATUS_VERIFYING;
51 if (str == update_engine::kUpdateStatusFinalizing) 51 if (str == update_engine::kUpdateStatusFinalizing)
52 return UpdateEngineClient::UPDATE_STATUS_FINALIZING; 52 return UpdateEngineClient::UPDATE_STATUS_FINALIZING;
53 if (str == update_engine::kUpdateStatusUpdatedNeedReboot) 53 if (str == update_engine::kUpdateStatusUpdatedNeedReboot)
54 return UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT; 54 return UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT;
55 if (str == update_engine::kUpdateStatusReportingErrorEvent) 55 if (str == update_engine::kUpdateStatusReportingErrorEvent)
56 return UpdateEngineClient::UPDATE_STATUS_REPORTING_ERROR_EVENT; 56 return UpdateEngineClient::UPDATE_STATUS_REPORTING_ERROR_EVENT;
57 if (str == update_engine::kUpdateStatusAttemptingRollback)
58 return UpdateEngineClient::UPDATE_STATUS_ATTEMPTING_ROLLBACK;
57 return UpdateEngineClient::UPDATE_STATUS_ERROR; 59 return UpdateEngineClient::UPDATE_STATUS_ERROR;
58 } 60 }
59 61
60 // Used in UpdateEngineClient::EmptyUpdateCheckCallback(). 62 // Used in UpdateEngineClient::EmptyUpdateCheckCallback().
61 void EmptyUpdateCheckCallbackBody( 63 void EmptyUpdateCheckCallbackBody(
62 UpdateEngineClient::UpdateCheckResult unused_result) { 64 UpdateEngineClient::UpdateCheckResult unused_result) {
63 } 65 }
64 66
65 bool IsValidChannel(const std::string& channel) { 67 bool IsValidChannel(const std::string& channel) {
66 return channel == kReleaseChannelDev || 68 return channel == kReleaseChannelDev ||
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 473
472 private: 474 private:
473 void StateTransition() { 475 void StateTransition() {
474 UpdateStatusOperation next_status = UPDATE_STATUS_ERROR; 476 UpdateStatusOperation next_status = UPDATE_STATUS_ERROR;
475 int delay_ms = kStateTransitionDefaultDelayMs; 477 int delay_ms = kStateTransitionDefaultDelayMs;
476 switch (last_status_.status) { 478 switch (last_status_.status) {
477 case UPDATE_STATUS_ERROR: 479 case UPDATE_STATUS_ERROR:
478 case UPDATE_STATUS_IDLE: 480 case UPDATE_STATUS_IDLE:
479 case UPDATE_STATUS_UPDATED_NEED_REBOOT: 481 case UPDATE_STATUS_UPDATED_NEED_REBOOT:
480 case UPDATE_STATUS_REPORTING_ERROR_EVENT: 482 case UPDATE_STATUS_REPORTING_ERROR_EVENT:
483 case UPDATE_STATUS_ATTEMPTING_ROLLBACK:
481 return; 484 return;
482 case UPDATE_STATUS_CHECKING_FOR_UPDATE: 485 case UPDATE_STATUS_CHECKING_FOR_UPDATE:
483 next_status = UPDATE_STATUS_UPDATE_AVAILABLE; 486 next_status = UPDATE_STATUS_UPDATE_AVAILABLE;
484 break; 487 break;
485 case UPDATE_STATUS_UPDATE_AVAILABLE: 488 case UPDATE_STATUS_UPDATE_AVAILABLE:
486 next_status = UPDATE_STATUS_DOWNLOADING; 489 next_status = UPDATE_STATUS_DOWNLOADING;
487 break; 490 break;
488 case UPDATE_STATUS_DOWNLOADING: 491 case UPDATE_STATUS_DOWNLOADING:
489 if (last_status_.download_progress >= 1.0) { 492 if (last_status_.download_progress >= 1.0) {
490 next_status = UPDATE_STATUS_VERIFYING; 493 next_status = UPDATE_STATUS_VERIFYING;
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) 542 if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
540 return new UpdateEngineClientImpl(); 543 return new UpdateEngineClientImpl();
541 DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type); 544 DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
542 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestAutoUpdateUI)) 545 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestAutoUpdateUI))
543 return new UpdateEngineClientFakeImpl(); 546 return new UpdateEngineClientFakeImpl();
544 else 547 else
545 return new UpdateEngineClientStubImpl(); 548 return new UpdateEngineClientStubImpl();
546 } 549 }
547 550
548 } // namespace chromeos 551 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/dbus/update_engine_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698