summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_about_handler.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-21 17:41:16 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-21 17:41:16 +0000
commit8da1fa0d697791cbfc2415f6352be13b7c9c685b (patch)
tree6eb0de9df326f819570c2c94dfc9cb9e75daf0a4 /chrome/browser/browser_about_handler.cc
parent6a939dc42610b8e79b45e9107a64c3aab916c85b (diff)
downloadchromium_src-8da1fa0d697791cbfc2415f6352be13b7c9c685b.zip
chromium_src-8da1fa0d697791cbfc2415f6352be13b7c9c685b.tar.gz
chromium_src-8da1fa0d697791cbfc2415f6352be13b7c9c685b.tar.bz2
Reverting r26698. Somehow this broke scons?
TBR=stuartmorgan Review URL: http://codereview.chromium.org/217004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26699 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_about_handler.cc')
-rw-r--r--chrome/browser/browser_about_handler.cc23
1 files changed, 23 insertions, 0 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 9331606..3e4baf3 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -75,6 +75,7 @@ const char kStatsPath[] = "stats";
const char kVersionPath[] = "version";
const char kCreditsPath[] = "credits";
const char kTermsPath[] = "terms";
+const char kLinuxSplash[] = "linux-splash";
const char kSyncPath[] = "sync";
// Points to the singleton AboutSource object, if any.
@@ -194,6 +195,23 @@ std::string AboutHistograms(const std::string& query) {
return data;
}
+std::string AboutLinuxSplash() {
+ int resource_id = IDR_LINUX_SPLASH_HTML_CHROMIUM;
+ scoped_ptr<FileVersionInfo> version_info(
+ FileVersionInfo::CreateFileVersionInfoForCurrentModule());
+ if (version_info == NULL) {
+ DLOG(ERROR) << "Unable to create FileVersionInfo object";
+ } else {
+ if (version_info->is_official_build()) {
+ resource_id = IDR_LINUX_SPLASH_HTML_CHROME;
+ }
+ }
+ static const std::string linux_splash_html =
+ ResourceBundle::GetSharedInstance().GetDataResource(resource_id);
+
+ return linux_splash_html;
+}
+
void AboutMemory(AboutSource* source, int request_id) {
// The AboutMemoryHandler cleans itself up.
new AboutMemoryHandler(source, request_id);
@@ -567,6 +585,11 @@ void AboutSource::StartDataRequest(const std::string& path_raw,
response = AboutSync();
#endif
}
+#if defined(OS_LINUX)
+ else if (path == kLinuxSplash) {
+ response = AboutLinuxSplash();
+ }
+#endif
FinishDataRequest(response, request_id);
}