| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/common/platform_util.h" | 5 #include "chrome/common/platform_util.h" |
| 6 | 6 |
| 7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
| 8 | 8 |
| 9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
| 10 #include "app/l10n_util_mac.h" | 10 #include "app/l10n_util_mac.h" |
| 11 #include "base/file_path.h" | 11 #include "base/file_path.h" |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 } | 86 } |
| 87 | 87 |
| 88 string16 GetVersionStringModifier() { | 88 string16 GetVersionStringModifier() { |
| 89 #if defined(GOOGLE_CHROME_BUILD) | 89 #if defined(GOOGLE_CHROME_BUILD) |
| 90 NSBundle* bundle = mac_util::MainAppBundle(); | 90 NSBundle* bundle = mac_util::MainAppBundle(); |
| 91 NSString* channel = [bundle objectForInfoDictionaryKey:@"KSChannelID"]; | 91 NSString* channel = [bundle objectForInfoDictionaryKey:@"KSChannelID"]; |
| 92 if (!channel) | 92 if (!channel) |
| 93 channel = @"stable"; | 93 channel = @"stable"; |
| 94 return base::SysNSStringToUTF16(channel); | 94 return base::SysNSStringToUTF16(channel); |
| 95 #else | 95 #else |
| 96 return EmptyString16(); | 96 return string16(); |
| 97 #endif | 97 #endif |
| 98 } | 98 } |
| 99 | 99 |
| 100 } // namespace platform_util | 100 } // namespace platform_util |
| OLD | NEW |