Revert 117136 - separate about page into its own page (included in chrome://chrome)

chrome/browser/ui/webui/uber/uber_ui.cc

 // Copyright (c) 2012 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/ui/webui/uber/uber_ui.h"
 
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
@@ skipping 22 matching lines @@
   source->AddLocalizedString("shortProductName", IDS_SHORT_PRODUCT_NAME);
 
   source->AddString("settingsHost",
                     ASCIIToUTF16(chrome::kChromeUISettingsHost));
   source->AddLocalizedString("settingsDisplayName", IDS_SETTINGS_TITLE);
   source->AddString("extensionsHost",
                     ASCIIToUTF16(chrome::kChromeUIExtensionsHost));
   source->AddLocalizedString("extensionsDisplayName",
                              IDS_MANAGE_EXTENSIONS_SETTING_WINDOWS_TITLE);
 
-#if defined(OS_CHROMEOS)
-  source->AddString("aboutPageHost",
-                    ASCIIToUTF16(chrome::kAboutOptionsSubPage));
-  source->AddLocalizedString("aboutPageDisplayName", IDS_ABOUT_TAB_TITLE);
-#endif
   return source;
 }
 
 }  // namespace
 
 UberUI::UberUI(WebContents* contents) : WebUI(contents) {
   Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
   profile->GetChromeURLDataManager()->AddDataSource(CreateUberHTMLSource());
 
   RegisterSubpage(chrome::kChromeUISettingsFrameURL);
   RegisterSubpage(chrome::kChromeUIExtensionsFrameURL);
-#if defined(OS_CHROMEOS)
-  RegisterSubpage(chrome::kChromeUIAboutPageFrameURL);
-#endif
 }
 
 UberUI::~UberUI() {
   STLDeleteValues(&sub_uis_);
 }
 
 void UberUI::RegisterSubpage(const std::string& page_url) {
   WebUI* web_ui = ChromeWebUIFactory::GetInstance()->CreateWebUIForURL(
           web_contents_, GURL(page_url));
 
@@ skipping 35 matching lines @@
   SubpageMap::iterator subpage = sub_uis_.find(source_url.GetOrigin().spec());
   if (subpage == sub_uis_.end()) {
     // The message was sent from the uber page itself.
     DCHECK_EQ(std::string(chrome::kChromeUIUberHost), source_url.host());
     WebUI::OnWebUISend(source_url, message, args);
   } else {
     // The message was sent from a subpage.
     subpage->second->OnWebUISend(source_url, message, args);
   }
 }