OLD | NEW |
1 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium OS 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 "update_engine/dbus_service.h" | 5 #include "update_engine/dbus_service.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include <base/logging.h> | 9 #include <base/logging.h> |
10 | 10 |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 if (!chromeos_update_engine::utils::IsOfficialBuild()) { | 62 if (!chromeos_update_engine::utils::IsOfficialBuild()) { |
63 if (app_version) { | 63 if (app_version) { |
64 update_app_version = app_version; | 64 update_app_version = app_version; |
65 } | 65 } |
66 if (omaha_url) { | 66 if (omaha_url) { |
67 update_omaha_url = omaha_url; | 67 update_omaha_url = omaha_url; |
68 } | 68 } |
69 } | 69 } |
70 LOG(INFO) << "Attempt update: app_version=\"" << update_app_version << "\" " | 70 LOG(INFO) << "Attempt update: app_version=\"" << update_app_version << "\" " |
71 << "omaha_url=\"" << update_omaha_url << "\""; | 71 << "omaha_url=\"" << update_omaha_url << "\""; |
72 self->update_attempter_->CheckForUpdate(app_version, omaha_url); | 72 self->update_attempter_->CheckForUpdate(update_app_version, update_omaha_url); |
73 return TRUE; | 73 return TRUE; |
74 } | 74 } |
75 | 75 |
76 gboolean update_engine_service_get_status(UpdateEngineService* self, | 76 gboolean update_engine_service_get_status(UpdateEngineService* self, |
77 int64_t* last_checked_time, | 77 int64_t* last_checked_time, |
78 double* progress, | 78 double* progress, |
79 gchar** current_operation, | 79 gchar** current_operation, |
80 gchar** new_version, | 80 gchar** new_version, |
81 int64_t* new_size, | 81 int64_t* new_size, |
82 GError **error) { | 82 GError **error) { |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 g_signal_emit(self, | 117 g_signal_emit(self, |
118 status_update_signal, | 118 status_update_signal, |
119 0, | 119 0, |
120 last_checked_time, | 120 last_checked_time, |
121 progress, | 121 progress, |
122 current_operation, | 122 current_operation, |
123 new_version, | 123 new_version, |
124 new_size); | 124 new_size); |
125 return TRUE; | 125 return TRUE; |
126 } | 126 } |
OLD | NEW |