Retry of r26698.

R=stuartmorgan

Review URL: http://codereview.chromium.org/208047

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26704 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 23 deletions

diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 3e4baf3..9331606 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -75,7 +75,6 @@ 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.
@@ -195,23 +194,6 @@ 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);
@@ -585,11 +567,6 @@ 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);
 }