| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #import "chrome/browser/mac/keystone_glue.h" | 5 #import "chrome/browser/mac/keystone_glue.h" |
| 6 | 6 |
| 7 #include <sys/param.h> | 7 #include <sys/param.h> |
| 8 #include <sys/mount.h> | 8 #include <sys/mount.h> |
| 9 | 9 |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "base/bind.h" | 12 #include "base/bind.h" |
| 13 #include "base/file_util.h" | 13 #include "base/file_util.h" |
| 14 #include "base/location.h" | 14 #include "base/location.h" |
| 15 #include "base/logging.h" | 15 #include "base/logging.h" |
| 16 #include "base/mac/mac_util.h" | 16 #include "base/mac/mac_util.h" |
| 17 #include "base/mac/scoped_nsautorelease_pool.h" | 17 #include "base/mac/scoped_nsautorelease_pool.h" |
| 18 #include "base/mac/scoped_nsexception_enabler.h" | 18 #include "base/mac/scoped_nsexception_enabler.h" |
| 19 #include "base/memory/ref_counted.h" | 19 #include "base/memory/ref_counted.h" |
| 20 #include "base/sys_string_conversions.h" | 20 #include "base/sys_string_conversions.h" |
| 21 #include "base/task.h" | |
| 22 #include "base/threading/worker_pool.h" | 21 #include "base/threading/worker_pool.h" |
| 23 #include "chrome/browser/mac/authorization_util.h" | 22 #include "chrome/browser/mac/authorization_util.h" |
| 24 #import "chrome/browser/mac/keystone_registration.h" | 23 #import "chrome/browser/mac/keystone_registration.h" |
| 25 #include "chrome/common/chrome_constants.h" | 24 #include "chrome/common/chrome_constants.h" |
| 26 #include "chrome/common/chrome_version_info.h" | 25 #include "chrome/common/chrome_version_info.h" |
| 27 #include "grit/chromium_strings.h" | 26 #include "grit/chromium_strings.h" |
| 28 #include "grit/generated_resources.h" | 27 #include "grit/generated_resources.h" |
| 29 #include "ui/base/l10n/l10n_util.h" | 28 #include "ui/base/l10n/l10n_util.h" |
| 30 #include "ui/base/l10n/l10n_util_mac.h" | 29 #include "ui/base/l10n/l10n_util_mac.h" |
| 31 | 30 |
| (...skipping 952 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 984 return [KeystoneGlue defaultKeystoneGlue] != nil; | 983 return [KeystoneGlue defaultKeystoneGlue] != nil; |
| 985 } | 984 } |
| 986 | 985 |
| 987 string16 CurrentlyInstalledVersion() { | 986 string16 CurrentlyInstalledVersion() { |
| 988 KeystoneGlue* keystoneGlue = [KeystoneGlue defaultKeystoneGlue]; | 987 KeystoneGlue* keystoneGlue = [KeystoneGlue defaultKeystoneGlue]; |
| 989 NSString* version = [keystoneGlue currentlyInstalledVersion]; | 988 NSString* version = [keystoneGlue currentlyInstalledVersion]; |
| 990 return base::SysNSStringToUTF16(version); | 989 return base::SysNSStringToUTF16(version); |
| 991 } | 990 } |
| 992 | 991 |
| 993 } // namespace keystone_glue | 992 } // namespace keystone_glue |
| OLD | NEW |