diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-22 22:24:12 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-22 22:24:12 +0000 |
| commit | c01fa2a687608763b855e19e5810a800ab763e12 (patch) | |
| tree | 951980a0ee1e09270718047a4e2ffb14cb0a5bea /chrome | |
| parent | f9953b007293ecd6f4a972db18f6f5d60edd28ba (diff) | |
| download | chromium_src-c01fa2a687608763b855e19e5810a800ab763e12.zip chromium_src-c01fa2a687608763b855e19e5810a800ab763e12.tar.gz chromium_src-c01fa2a687608763b855e19e5810a800ab763e12.tar.bz2 | |
Use "canary" instead of "canary build" as the channel name in the Windows
canary, matching the Mac canary and the new approved naming.
BUG=79814
TEST=The About window
Review URL: http://codereview.chromium.org/6895022
Review URL: http://codereview.chromium.org/6897028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82734 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service.cc | 2 | ||||
| -rw-r--r-- | chrome/installer/util/google_chrome_sxs_distribution.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 22ba54f..5a300eb 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -91,7 +91,7 @@ ProfileSyncService::ProfileSyncService(ProfileSyncFactory* factory, // GetVersionStringModifier hits the registry. See http://crbug.com/70380. base::ThreadRestrictions::ScopedAllowIO allow_io; // For stable, this is "". For dev, this is "dev". For beta, this is "beta". - // For daily, this is "canary build". + // For daily, this is "canary". // For Linux Chromium builds, this could be anything depending on the // distribution, so always direct those users to dev server urls. // If this is an official build, it will always be one of the above. diff --git a/chrome/installer/util/google_chrome_sxs_distribution.cc b/chrome/installer/util/google_chrome_sxs_distribution.cc index 9ea35f1..416bc67 100644 --- a/chrome/installer/util/google_chrome_sxs_distribution.cc +++ b/chrome/installer/util/google_chrome_sxs_distribution.cc @@ -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. // @@ -14,7 +14,7 @@ namespace { const wchar_t kChromeSxSGuid[] = L"{4ea16ac7-fd5a-47c3-875b-dbf4a2008c20}"; -const wchar_t kChannelName[] = L"canary build"; +const wchar_t kChannelName[] = L"canary"; const wchar_t kBrowserAppId[] = L"ChromeCanary"; const int kSxSIconIndex = 4; |