Update Channel Changer to support a new Dev channel tag.

I want to declare 1.1-dev users "on the Beta channel" and
create a new 2.0-dev tag for the Dev channel. To do that 
I needed to make the Channel Changer recognize 1.1-dev as
Beta.

I also changed some strings:

  * make the note about changing to a more stable channel 
    a little clearer
  * make the dialog title 'Channel Changer' (instead of 
    Switcher)

The vcproj needed to be updated for the Release rule. 
(Jungshik changed Debug in r7532.)

Review URL: http://codereview.chromium.org/17050

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7559 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 0 deletions

diff --git a/tools/channel_changer/channel_changer.cc b/tools/channel_changer/channel_changer.cc
index 26898c7..3b23dc1 100644
--- a/tools/channel_changer/channel_changer.cc
+++ b/tools/channel_changer/channel_changer.cc
@@ -12,6 +12,7 @@
 enum Branch {
   UNKNOWN_BRANCH = 0,
   DEV_BRANCH,
+  OLD_DEV_BRANCH,
   BETA_BRANCH,
   STABLE_BRANCH,
 };
@@ -19,6 +20,7 @@ enum 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"",
@@ -28,6 +30,7 @@ static const wchar_t* const kBranchStrings[] = {
 static const wchar_t* const kBranchStringsReadable[] = {
   L"?",
   L"Dev",
+  L"Beta (was Dev)",
   L"Beta",
   L"Stable",
 };
@@ -106,6 +109,11 @@ void DetectBranch() {
         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];
   }
 }