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

Side by Side Diff: chrome/browser/ui/webui/help/version_updater_chromeos.cc

Issue 2059143002: "up-to-date" should only use hyphens when used as compound modifier of a noun (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_actions_model.cc ('k') | chrome/common/all_messages.h » ('j') | 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 "chrome/browser/ui/webui/help/version_updater_chromeos.h" 5 #include "chrome/browser/ui/webui/help/version_updater_chromeos.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 } 193 }
194 194
195 void VersionUpdaterCros::UpdateStatusChanged( 195 void VersionUpdaterCros::UpdateStatusChanged(
196 const UpdateEngineClient::Status& status) { 196 const UpdateEngineClient::Status& status) {
197 Status my_status = UPDATED; 197 Status my_status = UPDATED;
198 int progress = 0; 198 int progress = 0;
199 base::string16 message; 199 base::string16 message;
200 200
201 // If the updater is currently idle, just show the last operation (unless it 201 // If the updater is currently idle, just show the last operation (unless it
202 // was previously checking for an update -- in that case, the system is 202 // was previously checking for an update -- in that case, the system is
203 // up-to-date now). See http://crbug.com/120063 for details. 203 // up to date now). See http://crbug.com/120063 for details.
204 UpdateEngineClient::UpdateStatusOperation operation_to_show = status.status; 204 UpdateEngineClient::UpdateStatusOperation operation_to_show = status.status;
205 if (status.status == UpdateEngineClient::UPDATE_STATUS_IDLE && 205 if (status.status == UpdateEngineClient::UPDATE_STATUS_IDLE &&
206 last_operation_ != 206 last_operation_ !=
207 UpdateEngineClient::UPDATE_STATUS_CHECKING_FOR_UPDATE) { 207 UpdateEngineClient::UPDATE_STATUS_CHECKING_FOR_UPDATE) {
208 operation_to_show = last_operation_; 208 operation_to_show = last_operation_;
209 } 209 }
210 210
211 switch (operation_to_show) { 211 switch (operation_to_show) {
212 case UpdateEngineClient::UPDATE_STATUS_ERROR: 212 case UpdateEngineClient::UPDATE_STATUS_ERROR:
213 case UpdateEngineClient::UPDATE_STATUS_REPORTING_ERROR_EVENT: 213 case UpdateEngineClient::UPDATE_STATUS_REPORTING_ERROR_EVENT:
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 } 249 }
250 } 250 }
251 251
252 void VersionUpdaterCros::OnUpdateCheck( 252 void VersionUpdaterCros::OnUpdateCheck(
253 UpdateEngineClient::UpdateCheckResult result) { 253 UpdateEngineClient::UpdateCheckResult result) {
254 // If version updating is not implemented, this binary is the most up-to-date 254 // If version updating is not implemented, this binary is the most up-to-date
255 // possible with respect to automatic updating. 255 // possible with respect to automatic updating.
256 if (result == UpdateEngineClient::UPDATE_RESULT_NOTIMPLEMENTED) 256 if (result == UpdateEngineClient::UPDATE_RESULT_NOTIMPLEMENTED)
257 callback_.Run(UPDATED, 0, base::string16()); 257 callback_.Run(UPDATED, 0, base::string16());
258 } 258 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_actions_model.cc ('k') | chrome/common/all_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698