Show chromium os version in about panel

chrome/browser/views/about_chrome_view.cc

 // Copyright (c) 2009 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/views/about_chrome_view.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/color_utils.h"
 #include "base/i18n/word_iterator.h"
 #include "app/l10n_util.h"
@@ skipping 65 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),
       check_button_status_(CHECKBUTTON_HIDDEN),
       chromium_url_appears_first_(true),
       text_direction_is_rtl_(false) {
   DCHECK(profile);
+#if defined(OS_CHROMEOS)
+  loader_.GetVersion(&consumer_,
+      NewCallback(this, &AboutChromeView::OnOSVersion));
+#endif
   Init();
 
 #if defined(OS_WIN)
   google_updater_ = new GoogleUpdate();
   google_updater_->AddStatusChangeListener(this);
 #endif
 
   if (kBackgroundBmp == NULL) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     kBackgroundBmp = rb.GetBitmapNamed(IDR_ABOUT_BACKGROUND_COLOR);
@@ skipping 75 matching lines @@
   version_label_ = new views::Textfield();
   version_label_->SetText(WideToUTF16Hack(current_version_));
   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_);
 
+#if defined(OS_CHROMEOS)
+  os_version_label_ = new views::Textfield();
+  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(
       l10n_util::GetString(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.
   std::wstring text = l10n_util::GetString(IDS_ABOUT_VERSION_LICENSE);
@@ skipping 105 matching lines @@
 
   // Then we have the version number right below it.
   sz = version_label_->GetPreferredSize();
   version_label_->SetBounds(kPanelHorizMargin,
                             about_title_label_->y() +
                                 about_title_label_->height() +
                                 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(
+      kPanelHorizMargin,
+      version_label_->y() +
+          version_label_->height() +
+          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 + kRelatedControlVerticalSpacing;
   sz.set_width(panel_size.width() - 2 * kPanelHorizMargin);
 
   // Draw the text right below the background image.
   copyright_label_->SetBounds(kPanelHorizMargin,
                               y_pos,
                               sz.width(),
                               sz.height());
@@ skipping 402 matching lines @@
   if (source == terms_of_service_url_)
     url = GURL(chrome::kAboutTermsURL);
   else if (source == chromium_url_)
     url = GURL(WideToUTF16Hack(l10n_util::GetString(IDS_CHROMIUM_PROJECT_URL)));
   else if (source == open_source_url_)
     url = GURL(chrome::kAboutCreditsURL);
   else
     NOTREACHED() << "Unknown link source";
 
   Browser* browser = BrowserList::GetLastActive();
+#if defined(OS_CHROMEOS)
+  browser->OpenURL(url, GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);

[Finnur, 2009/11/24 18:54:38]

Won't this open a tab behind the About box, which the user cannot get to but by
closing the About box? Is that better than the current behavior?

+#else
   browser->OpenURL(url, GURL(), NEW_WINDOW, PageTransition::LINK);
+#endif
 }
 
+#if defined(OS_CHROMEOS)
+void AboutChromeView::OnOSVersion(
+    chromeos::VersionLoader::Handle handle,
+    std::string version) {
+  os_version_label_->SetText(UTF8ToUTF16(version));
+}
+#endif
+
 #if defined(OS_WIN)
 ////////////////////////////////////////////////////////////////////////////////
 // AboutChromeView, GoogleUpdateStatusListener implementation:
 
 void AboutChromeView::OnReportResults(GoogleUpdateUpgradeResult result,
                                       GoogleUpdateErrorCode error_code,
                                       const std::wstring& version) {
   // Drop the last reference to the object so that it gets cleaned up here.
   google_updater_ = NULL;
 
@@ skipping 109 matching lines @@
   View* parent = GetParent();
   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