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

3 files changed, 11 insertions, 3 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];
   }
 }
 
diff --git a/tools/channel_changer/channel_changer.rc b/tools/channel_changer/channel_changer.rc
index cf992c8..d279874 100644
--- a/tools/channel_changer/channel_changer.rc
+++ b/tools/channel_changer/channel_changer.rc
@@ -39,7 +39,7 @@ IDI_BRANCH_SWITCHER     ICON                    "../../chrome/app/theme/google_c
 
 IDD_MAIN_DIALOG DIALOGEX 0, 0, 414, 143
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Google Chrome Channel Switcher v1.3"
+CAPTION "Google Chrome Channel Changer 2.0"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Update",IDOK,157,120,50,14
@@ -52,7 +52,7 @@ BEGIN
     CONTROL         "Dev: The latest features and bugfixes (~ weekly updates).",IDC_CUTTING_EDGE,
                     "Button",BS_AUTORADIOBUTTON | BS_MULTILINE,47,73,340,8
     CONTROL         129,IDC_IMAGEVIEW,"Static",SS_BITMAP,7,7,35,30
-    LTEXT           "Note: If you switch from Dev to Beta, you'll stay on the current Chrome version until the Beta channel gets a later update. Changing channels does not change the version of Chrome you are currently using.",IDC_SECONDARY_LABEL,47,95,340,21
+    LTEXT           "Note: If you change to a more stable channel, you will not get updates until that channel is updated to a later version than what you are using now. To go back to an earlier version, re-install Google Chrome.",IDC_SECONDARY_LABEL,47,89,340,26
 END
 
 
diff --git a/tools/channel_changer/channel_changer.vcproj b/tools/channel_changer/channel_changer.vcproj
index 21cf8b4..4e005f0 100644
--- a/tools/channel_changer/channel_changer.vcproj
+++ b/tools/channel_changer/channel_changer.vcproj
@@ -98,7 +98,7 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\using_vista_platform_sdk.vsprops"
+			InheritedPropertySheets=".\using_platform_sdk_6_1.vsprops"
 			UseOfATL="1"
 			CharacterSet="1"
 			WholeProgramOptimization="1"