Add more information to about:version and "About Chromium" dialog

chrome/browser/ui/views/about_chrome_view.cc

 // 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.
 
 #include "chrome/browser/ui/views/about_chrome_view.h"
 
 #if defined(OS_WIN)
 #include <commdlg.h>
 #endif  // defined(OS_WIN)
 
@@ skipping 89 matching lines @@
 }  // namespace browser
 
 ////////////////////////////////////////////////////////////////////////////////
 // AboutChromeView, public:
 
 AboutChromeView::AboutChromeView(Profile* profile)
     : profile_(profile),
       about_dlg_background_logo_(NULL),
       about_title_label_(NULL),
       version_label_(NULL),
-#if defined(OS_CHROMEOS)
       os_version_label_(NULL),
-#endif
       copyright_label_(NULL),
       main_text_label_(NULL),
       main_text_label_height_(0),
       chromium_url_(NULL),
       open_source_url_(NULL),
       terms_of_service_url_(NULL),
       restart_button_visible_(false),
       chromium_url_appears_first_(true),
       text_direction_is_rtl_(false) {
   DCHECK(profile);
-#if defined(OS_CHROMEOS)
-  loader_.GetVersion(&consumer_,
-                     NewCallback(this, &AboutChromeView::OnOSVersion),
-                     chromeos::VersionLoader::VERSION_FULL);
-#endif
+
   Init();
 
 #if defined(OS_WIN) || defined(OS_CHROMEOS)
   google_updater_ = new GoogleUpdate();
   google_updater_->set_status_listener(this);
 #endif
 
   if (kBackgroundBmp == NULL) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     kBackgroundBmp = rb.GetBitmapNamed(IDR_ABOUT_BACKGROUND_COLOR);
@@ skipping 23 matching lines @@
 
   // This code only runs as a result of the user opening the About box so
   // doing registry access to get the version string modifier should be fine.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
   std::string version_modifier = platform_util::GetVersionStringModifier();
   if (!version_modifier.empty())
     version_details_ += " " + version_modifier;
 
 #if !defined(GOOGLE_CHROME_BUILD)
   version_details_ += " (";
+  version_details_ += l10n_util::GetStringUTF8(
+      version_info.IsOfficialBuild() ?
+      IDS_ABOUT_VERSION_OFFICIAL : IDS_ABOUT_VERSION_UNOFFICIAL);
+  version_details_ += " ";
   version_details_ += version_info.LastChange();
   version_details_ += ")";
 #endif
 
   // Views we will add to the *parent* of this dialog, since it will display
   // next to the buttons which we don't draw ourselves.
   throbber_.reset(new views::Throbber(50, true));
   throbber_->set_parent_owned(false);
   throbber_->SetVisible(false);
 
@@ skipping 35 matching lines @@
   version_label_ = new views::Textfield();
   version_label_->SetText(ASCIIToUTF16(current_version_ + version_details_));
   version_label_->SetReadOnly(true);
   version_label_->RemoveBorder();
   version_label_->SetTextColor(SK_ColorBLACK);
   version_label_->SetBackgroundColor(SK_ColorWHITE);
   version_label_->SetFont(ResourceBundle::GetSharedInstance().GetFont(
       ResourceBundle::BaseFont));
   AddChildView(version_label_);
 
+  os_version_label_ = new views::Textfield(views::Textfield::STYLE_MULTILINE);
 #if defined(OS_CHROMEOS)
-  os_version_label_ = new views::Textfield(views::Textfield::STYLE_MULTILINE);
+  loader_.GetVersion(&consumer_,
+                     NewCallback(this, &AboutChromeView::OnOSVersion),
+                     chromeos::VersionLoader::VERSION_FULL);
+#else
+  os_version_label_->SetText(UTF8ToUTF16(version_info.OSType()));
+#endif
   os_version_label_->SetReadOnly(true);
   os_version_label_->RemoveBorder();
   os_version_label_->SetTextColor(SK_ColorBLACK);
   os_version_label_->SetBackgroundColor(SK_ColorWHITE);
   os_version_label_->SetFont(ResourceBundle::GetSharedInstance().GetFont(
       ResourceBundle::BaseFont));
   AddChildView(os_version_label_);
-#endif
 
   // The copyright URL portion of the main label.
   copyright_label_ = new views::Label(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_COPYRIGHT)));
   copyright_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   AddChildView(copyright_label_);
 
   main_text_label_ = new views::Label(L"");
 
   // Figure out what to write in the main label of the About box.
@@ skipping 108 matching lines @@
 
   // Then we have the version number right below it.
   sz = version_label_->GetPreferredSize();
   version_label_->SetBounds(views::kPanelHorizMargin,
                             about_title_label_->y() +
                                 about_title_label_->height() +
                                 views::kRelatedControlVerticalSpacing,
                             kVersionFieldWidth,
                             sz.height());
 
-#if defined(OS_CHROMEOS)
   // Then we have the version number right below it.
   sz = os_version_label_->GetPreferredSize();
   os_version_label_->SetBounds(
       views::kPanelHorizMargin,
       version_label_->y() +
           version_label_->height() +
           views::kRelatedControlVerticalSpacing,
       kVersionFieldWidth,
       sz.height());
-#endif
 
   // For the width of the main text label we want to use up the whole panel
   // width and remaining height, minus a little margin on each side.
   int y_pos = background_image_height + views::kRelatedControlVerticalSpacing;
   sz.set_width(panel_size.width() - 2 * views::kPanelHorizMargin);
 
   // Draw the text right below the background image.
   copyright_label_->SetBounds(views::kPanelHorizMargin,
                               y_pos,
                               sz.width(),
@@ skipping 440 matching lines @@
   // We have updated controls on the parent, so we need to update its layout.
   parent()->Layout();
 
   // Check button may have appeared/disappeared. We cannot call this during
   // ViewHierarchyChanged because the |window()| pointer hasn't been set yet.
   if (window())
     GetDialogClientView()->UpdateDialogButtons();
 }
 
 #endif