| 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/file_util.h" | 12 #include "base/file_util.h" |
| 13 #include "base/location.h" |
| 13 #include "base/logging.h" | 14 #include "base/logging.h" |
| 14 #include "base/mac/mac_util.h" | 15 #include "base/mac/mac_util.h" |
| 15 #include "base/mac/scoped_nsautorelease_pool.h" | 16 #include "base/mac/scoped_nsautorelease_pool.h" |
| 16 #include "base/mac/scoped_nsexception_enabler.h" | 17 #include "base/mac/scoped_nsexception_enabler.h" |
| 17 #include "base/memory/ref_counted.h" | 18 #include "base/memory/ref_counted.h" |
| 18 #include "base/sys_string_conversions.h" | 19 #include "base/sys_string_conversions.h" |
| 19 #include "base/task.h" | 20 #include "base/task.h" |
| 20 #include "base/threading/worker_pool.h" | 21 #include "base/threading/worker_pool.h" |
| 21 #include "chrome/browser/mac/authorization_util.h" | 22 #include "chrome/browser/mac/authorization_util.h" |
| 22 #import "chrome/browser/mac/keystone_registration.h" | 23 #import "chrome/browser/mac/keystone_registration.h" |
| (...skipping 913 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 936 return [KeystoneGlue defaultKeystoneGlue] != nil; | 937 return [KeystoneGlue defaultKeystoneGlue] != nil; |
| 937 } | 938 } |
| 938 | 939 |
| 939 string16 CurrentlyInstalledVersion() { | 940 string16 CurrentlyInstalledVersion() { |
| 940 KeystoneGlue* keystoneGlue = [KeystoneGlue defaultKeystoneGlue]; | 941 KeystoneGlue* keystoneGlue = [KeystoneGlue defaultKeystoneGlue]; |
| 941 NSString* version = [keystoneGlue currentlyInstalledVersion]; | 942 NSString* version = [keystoneGlue currentlyInstalledVersion]; |
| 942 return base::SysNSStringToUTF16(version); | 943 return base::SysNSStringToUTF16(version); |
| 943 } | 944 } |
| 944 | 945 |
| 945 } // namespace keystone_glue | 946 } // namespace keystone_glue |
| OLD | NEW |