Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(154)

Unified Diff: chrome/browser/views/about_chrome_view.h

Issue 440008: Show chromium os version in about panel (Closed)
Patch Set: Fix newline Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/views/about_chrome_view.cc » ('j') | chrome/browser/views/about_chrome_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/about_chrome_view.h
diff --git a/chrome/browser/views/about_chrome_view.h b/chrome/browser/views/about_chrome_view.h
index cfb8a034debda1910cc376a8b1a4b94e21cbf7a6..7ccb1886032a6166cf3e12f5e3cc298241b33500 100644
--- a/chrome/browser/views/about_chrome_view.h
+++ b/chrome/browser/views/about_chrome_view.h
@@ -15,6 +15,10 @@
#include "chrome/browser/google_update.h"
#endif
sky 2009/11/24 18:46:57 How about #else if instead of another #if.
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/version_loader.h"
+#endif
+
namespace views {
class Textfield;
class Throbber;
@@ -92,6 +96,12 @@ class AboutChromeView : public views::View,
GoogleUpdateErrorCode error_code);
#endif
+#if defined(OS_CHROMEOS)
+ // Callback from chromeos::VersionLoader giving the version.
+ void OnOSVersion(chromeos::VersionLoader::Handle handle,
+ std::string version);
+#endif
+
// Draws a string onto the canvas (wrapping if needed) while also keeping
// track of where it ends so we can position a URL after the text. The
// parameter |bounds| represents the boundary we have to work with, |position|
@@ -137,6 +147,9 @@ class AboutChromeView : public views::View,
views::ImageView* about_dlg_background_logo_;
views::Label* about_title_label_;
views::Textfield* version_label_;
+#if defined(OS_CHROMEOS)
+ views::Textfield* os_version_label_;
+#endif
views::Label* copyright_label_;
views::Label* main_text_label_;
int main_text_label_height_;
@@ -185,6 +198,14 @@ class AboutChromeView : public views::View,
// Whether text direction is left-to-right or right-to-left.
bool text_direction_is_rtl_;
+#if defined(OS_CHROMEOS)
+ // Handles asynchronously loading the version.
+ chromeos::VersionLoader loader_;
+
+ // Used to request the version.
+ CancelableRequestConsumer consumer_;
+#endif
+
DISALLOW_COPY_AND_ASSIGN(AboutChromeView);
};
« no previous file with comments | « no previous file | chrome/browser/views/about_chrome_view.cc » ('j') | chrome/browser/views/about_chrome_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698