Update Channel Changer to support a new Dev channel tag....

tools/channel_changer/channel_changer.cc

 // Copyright (c) 2006-2008 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.
 
 #include <Windowsx.h>
 
 #include "base/registry.h"
 
 #include "Resource.h"
 
 // This enum needs to be in sync with the strings below.
 enum Branch {
   UNKNOWN_BRANCH = 0,
   DEV_BRANCH,
+  OLD_DEV_BRANCH,
   BETA_BRANCH,
   STABLE_BRANCH,
 };
 
 // This vector of strings needs to be in sync with the Branch enum above.
 static const wchar_t* const kBranchStrings[] = {
   L"?",
+  L"2.0-dev",
   L"1.1-dev",
   L"1.1-beta",
   L"",
 };
 
 // This vector of strings needs to be in sync with the Branch enum above.
 static const wchar_t* const kBranchStringsReadable[] = {
   L"?",
   L"Dev",
+  L"Beta (was Dev)",
   L"Beta",
   L"Stable",
 };
 
 // The Registry Hive to write to. Points to the hive where we found the 'ap' key
 // unless there is an error, in which case it is 0.
 HKEY registry_hive = 0;
 
 // The value of the 'ap' key under the registry hive specified in
 // |registry_hive|.
@@ skipping 58 matching lines @@
     // '-full' to the channel name, which we need to strip out to determine what
     // channel you are on.
     std::wstring suffix = kChannelSuffix;
     if (update_branch.length() > suffix.length()) {
       size_t index = update_branch.rfind(suffix);
       if (index != std::wstring::npos &&
           index == update_branch.length() - suffix.length()) {
         update_branch = update_branch.substr(0, index);
       }
     }
+    // The 1.1-dev channel has been deprecated and all users have been
+    // logically moved to the Beta channel. If we find that token, we
+    // just declare the user on the Beta channel.
+    if (update_branch == kBranchStrings[OLD_DEV_BRANCH])
+      update_branch = kBranchStrings[BETA_BRANCH];
   }
 }
 
 void SetMainLabel(HWND dialog, Branch branch) {
   std::wstring main_label = L"You are currently on ";
   if (branch == DEV_BRANCH || branch == BETA_BRANCH || branch == STABLE_BRANCH)
     main_label += std::wstring(L"the ") + kBranchStringsReadable[branch] +
                   std::wstring(L" channel");
   else
     main_label += L"NO UPDATE CHANNEL";
@@ skipping 266 matching lines @@
 
   dlg_icon = ::LoadIcon(instance, MAKEINTRESOURCE(IDI_BRANCH_SWITCHER));
 
   ::DialogBox(instance,
               MAKEINTRESOURCE(IDD_MAIN_DIALOG),
               ::GetDesktopWindow(),
               DialogWndProc);
 
   return TRUE;
 }