| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "app/l10n_util_mac.h" | 5 #include "app/l10n_util_mac.h" |
| 6 #include "app/resource_bundle.h" | 6 #include "app/resource_bundle.h" |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/mac_util.h" | 8 #include "base/mac_util.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/sys_string_conversions.h" | 10 #include "base/sys_string_conversions.h" |
| (...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 | 316 |
| 317 case kAutoupdateInstallFailed: | 317 case kAutoupdateInstallFailed: |
| 318 recentShownInstallFailedStatus = YES; | 318 recentShownInstallFailedStatus = YES; |
| 319 | 319 |
| 320 // Allow another chance. | 320 // Allow another chance. |
| 321 [updateNowButton_ setEnabled:YES]; | 321 [updateNowButton_ setEnabled:YES]; |
| 322 | 322 |
| 323 // Fall through. | 323 // Fall through. |
| 324 | 324 |
| 325 case kAutoupdateCheckFailed: | 325 case kAutoupdateCheckFailed: |
| 326 // TODO(mark): Keystone doesn't currently indicate when a check for | |
| 327 // updates failed. Fix that. | |
| 328 imageID = IDR_UPDATE_FAIL; | 326 imageID = IDR_UPDATE_FAIL; |
| 329 message = l10n_util::GetNSStringFWithFixup(IDS_UPGRADE_ERROR, | 327 message = l10n_util::GetNSStringFWithFixup(IDS_UPGRADE_ERROR, |
| 330 IntToString16(status)); | 328 IntToString16(status)); |
| 331 | 329 |
| 332 break; | 330 break; |
| 333 | 331 |
| 334 default: | 332 default: |
| 335 NOTREACHED(); | 333 NOTREACHED(); |
| 336 return; | 334 return; |
| 337 } | 335 } |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 482 NSRange string_range = NSMakeRange(0, [legal_block length]); | 480 NSRange string_range = NSMakeRange(0, [legal_block length]); |
| 483 [legal_block addAttribute:NSFontAttributeName | 481 [legal_block addAttribute:NSFontAttributeName |
| 484 value:[NSFont labelFontOfSize:11] | 482 value:[NSFont labelFontOfSize:11] |
| 485 range:string_range]; | 483 range:string_range]; |
| 486 | 484 |
| 487 [legal_block endEditing]; | 485 [legal_block endEditing]; |
| 488 return legal_block; | 486 return legal_block; |
| 489 } | 487 } |
| 490 | 488 |
| 491 @end // @implementation AboutWindowController | 489 @end // @implementation AboutWindowController |
| OLD | NEW |