Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3614)

Unified Diff: chrome/browser/platform_util_mac.mm

Issue 6873062: Support "canary" as a version string modifier in Mac Chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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";
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698