Index: chrome/browser/ui/webui/help/help_handler.cc |
diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc |
index 6f3a246be2f659665f21efb848e254bb3cae6b65..5b10dbd21b0976195434c472d34d3439aec5a53e 100644 |
--- a/chrome/browser/ui/webui/help/help_handler.cc |
+++ b/chrome/browser/ui/webui/help/help_handler.cc |
@@ -34,13 +34,19 @@ |
#include "webkit/glue/webkit_glue.h" |
#if defined(OS_CHROMEOS) |
+#include "base/i18n/time_formatting.h" |
+#include "base/file_util_proxy.h" |
+#include "base/synchronization/lock.h" |
+#include "base/sys_info.h" |
#include "chrome/browser/chromeos/login/user_manager.h" |
#include "chrome/browser/chromeos/cros_settings.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/prefs/pref_service.h" |
+#include "content/public/browser/browser_thread.h" |
#endif |
using base::ListValue; |
+using content::BrowserThread; |
namespace { |
@@ -90,12 +96,24 @@ bool CanChangeReleaseChannel() { |
return false; |
} |
+// Pointer to a |StringValue| holding the date of the last update to Chromium |
+// OS. Because this value is obtained by reading a file, it is cached here to |
+// prevent the need to read from the file system multiple times unnecessarily. |
+Value* g_last_updated_string = NULL; |
+ |
+// Whether a request has started to fetch the "Last Updated" string. |
+bool g_started_fetching_update_string = false; |
+ |
+// Lock for |g_last_updated_string| and |g_started_fetching_update_string|. |
+base::Lock g_lock; |
Mark Mentovai
2012/04/17 22:03:31
C’mon, you just fixed g_last_updated_string to not
Kyle Horimoto
2012/04/17 23:37:29
Done.
|
+ |
#endif // defined(OS_CHROMEOS) |
} // namespace |
HelpHandler::HelpHandler() |
- : version_updater_(VersionUpdater::Create()) { |
+ : version_updater_(VersionUpdater::Create()), |
+ ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { |
} |
HelpHandler::~HelpHandler() { |
@@ -136,6 +154,7 @@ void HelpHandler::GetLocalizedValues(DictionaryValue* localized_strings) { |
{ "webkit", IDS_WEBKIT }, |
{ "userAgent", IDS_ABOUT_VERSION_USER_AGENT }, |
{ "commandLine", IDS_ABOUT_VERSION_COMMAND_LINE }, |
+ { "lastUpdated", IDS_ABOUT_VERSION_LAST_UPDATED }, |
#endif |
#if defined(OS_MACOSX) |
{ "promote", IDS_ABOUT_CHROME_PROMOTE_UPDATER }, |
@@ -235,6 +254,26 @@ void HelpHandler::OnPageLoaded(const ListValue* args) { |
base::Value::CreateBooleanValue(CanChangeReleaseChannel())); |
web_ui()->CallJavascriptFunction( |
"help.HelpPage.updateEnableReleaseChannel", *can_change_channel_value); |
+ |
+ g_lock.Acquire(); |
+ if (!g_started_fetching_update_string) { |
+ g_started_fetching_update_string = true; |
+ |
+ // If |g_started_fetching_update_string| is |false|, the date has not yet |
+ // been requested from the file system. Get the date of the last lsb-release |
+ // file modification. |
+ base::FileUtilProxy::GetFileInfo( |
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE), |
+ base::SysInfo::GetLsbReleaseFilePath(), |
+ base::Bind(&HelpHandler::ProcessLsbFileInfo, |
+ weak_factory_.GetWeakPtr())); |
+ } else if (g_last_updated_string != NULL) { |
+ // If it is not NULL, the date has already been retrieved from the file |
+ // system, so just use the cached value. |
+ web_ui()->CallJavascriptFunction("help.HelpPage.setLastUpdated", |
+ *g_last_updated_string); |
+ } |
+ g_lock.Release(); |
#endif // defined(OS_CHROMEOS) |
version_updater_->CheckForUpdate( |
@@ -380,4 +419,31 @@ void HelpHandler::OnReleaseChannel(const std::string& channel) { |
web_ui()->CallJavascriptFunction( |
"help.HelpPage.updateSelectedChannel", *channel_string); |
} |
+ |
+void HelpHandler::ProcessLsbFileInfo( |
+ base::PlatformFileError error, const base::PlatformFileInfo& file_info) { |
+ base::Time time; |
+ |
+ if (error == base::PLATFORM_FILE_OK) { |
+ // Retrieves the approximate time at which Chrome OS was last updated. Each |
+ // time a new build is created, /etc/lsb-release is modified with the new |
+ // version numbers of the release. Thus, this is a close approximation of |
+ // the time that the last Chrome OS update occurred. |
+ time = file_info.last_modified; |
+ } else { |
+ // If the time of the last update cannot be retrieved, punt and just set |
+ // the last update time to be the current time. |
+ time = base::Time::Now(); |
+ } |
+ |
+ // Note that this string will be internationalized. |
+ string16 last_updated = base::TimeFormatFriendlyDate(time); |
+ |
+ g_lock.Acquire(); |
+ g_last_updated_string = Value::CreateStringValue(last_updated); |
+ g_lock.Release(); |
+ |
+ web_ui()->CallJavascriptFunction("help.HelpPage.setLastUpdated", |
+ *g_last_updated_string); |
+} |
#endif // defined(OS_CHROMEOS) |