| Index: chrome/browser/platform_util_mac.mm
|
| ===================================================================
|
| --- chrome/browser/platform_util_mac.mm (revision 81961)
|
| +++ chrome/browser/platform_util_mac.mm (working copy)
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -6,7 +6,7 @@
|
|
|
| #include <Carbon/Carbon.h>
|
| #import <Cocoa/Cocoa.h>
|
| -#import <CoreServices/CoreServices.h>
|
| +#include <CoreServices/CoreServices.h>
|
|
|
| #include "base/file_path.h"
|
| #include "base/logging.h"
|
| @@ -187,14 +187,17 @@
|
| NSBundle* bundle = [NSBundle mainBundle];
|
| NSString* channel = [bundle objectForInfoDictionaryKey:@"KSChannelID"];
|
|
|
| - // Only ever return "", "unknown", "beta" or "dev" in a branded build.
|
| + // Only ever return "", "unknown", "beta", "dev", or "canary" in a branded
|
| + // build.
|
| if (![bundle objectForInfoDictionaryKey:@"KSProductID"]) {
|
| // This build is not Keystone-enabled, it can't have a channel.
|
| channel = @"unknown";
|
| } else if (!channel) {
|
| // For the stable channel, KSChannelID is not set.
|
| channel = @"";
|
| - } else if ([channel isEqual:@"beta"] || [channel isEqual:@"dev"]) {
|
| + } else if ([channel isEqual:@"beta"] ||
|
| + [channel isEqual:@"dev"] ||
|
| + [channel isEqual:@"canary") {
|
| // do nothing.
|
| } else {
|
| channel = @"unknown";
|
|
|