From 295470b39bdef891189fbf7b7222e25c0c47f25f Mon Sep 17 00:00:00 2001
From: "chocobo@chromium.org"
 <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 12 Apr 2011 21:36:39 +0000
Subject: Add stable track to available channels in about dialog for ChromeOS.
 Also renamed development track to dev track to be consistent with Chrome.
 BUG=chromium-os:14049 TEST=See the stable track in the drop down and select
 it. Make sure it persists after reboot. Review URL:
 http://codereview.chromium.org/6813115

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81309 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/browser/resources/options/about_page.html      | 5 ++---
 chrome/browser/ui/webui/options/about_page_handler.cc | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'chrome/browser')

diff --git a/chrome/browser/resources/options/about_page.html b/chrome/browser/resources/options/about_page.html
index 282b76e..b2a6100 100644
--- a/chrome/browser/resources/options/about_page.html
+++ b/chrome/browser/resources/options/about_page.html
@@ -27,10 +27,9 @@
           <span i18n-content="channel_warning_text"></span>
         </div>
         <select id="channelSelect">
-          <!-- There is no "release" channel at this moment -->
-          <!-- <option value="release" i18n-content="release"></option> -->
+          <option value="stable-channel" i18n-content="stable"></option>
           <option value="beta-channel" i18n-content="beta"></option>
-          <option value="dev-channel" i18n-content="development"></option>
+          <option value="dev-channel" i18n-content="dev"></option>
         </select>
       </div>
     </section>
diff --git a/chrome/browser/ui/webui/options/about_page_handler.cc b/chrome/browser/ui/webui/options/about_page_handler.cc
index 3326706..25f0477 100644
--- a/chrome/browser/ui/webui/options/about_page_handler.cc
+++ b/chrome/browser/ui/webui/options/about_page_handler.cc
@@ -122,9 +122,9 @@ void AboutPageHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
     { "more_info", IDS_ABOUT_PAGE_MORE_INFO },
     { "copyright", IDS_ABOUT_VERSION_COPYRIGHT },
     { "channel", IDS_ABOUT_PAGE_CHANNEL },
-    { "release", IDS_ABOUT_PAGE_CHANNEL_RELEASE },
+    { "stable", IDS_ABOUT_PAGE_CHANNEL_STABLE },
     { "beta", IDS_ABOUT_PAGE_CHANNEL_BETA },
-    { "development", IDS_ABOUT_PAGE_CHANNEL_DEVELOPMENT },
+    { "dev", IDS_ABOUT_PAGE_CHANNEL_DEVELOPMENT },
     { "canary", IDS_ABOUT_PAGE_CHANNEL_CANARY },
     { "channel_warning_header", IDS_ABOUT_PAGE_CHANNEL_WARNING_HEADER },
     { "channel_warning_text", IDS_ABOUT_PAGE_CHANNEL_WARNING_TEXT },
-- 
cgit v1.1