[uber page] Integrate history into uber page.

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 17 matching lines @@
       new ChromeWebUIDataSource(chrome::kChromeUIUberHost);
 
   source->set_json_path("strings.js");
   source->add_resource_path("uber.js", IDR_UBER_JS);
   source->add_resource_path("uber_utils.js", IDR_UBER_UTILS_JS);
   source->set_default_resource(IDR_UBER_HTML);
 
   // Hack alert: continue showing "Loading..." until a real title is set.
   source->AddLocalizedString("pageTitle", IDS_TAB_LOADING_TITLE);
 
+  source->AddString("extensionsFrameURL",
+                    ASCIIToUTF16(chrome::kChromeUIExtensionsFrameURL));
+  source->AddString("extensionsHost",
+                    ASCIIToUTF16(chrome::kChromeUIExtensionsHost));
+  source->AddString("helpFrameURL",
+                    ASCIIToUTF16(chrome::kChromeUIHelpFrameURL));
+  source->AddString("helpHost",
+                    ASCIIToUTF16(chrome::kChromeUIHelpHost));
+  source->AddString("historyFrameURL",
+                    ASCIIToUTF16(chrome::kChromeUIHistoryFrameURL));
+  source->AddString("historyHost",
+                    ASCIIToUTF16(chrome::kChromeUIHistoryHost));
+  source->AddString("settingsFrameURL",
+                    ASCIIToUTF16(chrome::kChromeUISettingsFrameURL));
   source->AddString("settingsHost",
                     ASCIIToUTF16(chrome::kChromeUISettingsHost));
-  source->AddString("extensionsHost",
-                    ASCIIToUTF16(chrome::kChromeUIExtensionsHost));
-  source->AddString("helpHost",
-                    ASCIIToUTF16(chrome::kChromeUIHelpHost));
 
   return source;
 }
 
 ChromeWebUIDataSource* CreateUberFrameHTMLSource() {
   ChromeWebUIDataSource* source =
       new ChromeWebUIDataSource(chrome::kChromeUIUberFrameHost);
 
   source->set_json_path("strings.js");
   source->add_resource_path("uber_frame.js", IDR_UBER_FRAME_JS);
   source->set_default_resource(IDR_UBER_FRAME_HTML);
 
   // TODO(jhawkins): Attempt to get rid of IDS_PRODUCT_OS_NAME.
 #if defined(OS_CHROMEOS)
   source->AddLocalizedString("shortProductName", IDS_PRODUCT_OS_NAME);
 #else
   source->AddLocalizedString("shortProductName", IDS_SHORT_PRODUCT_NAME);
 #endif  // defined(OS_CHROMEOS)
 
-  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);
   source->AddString("helpHost",
                     ASCIIToUTF16(chrome::kChromeUIHelpHost));
   source->AddLocalizedString("helpDisplayName", IDS_HELP_TITLE);
+  source->AddString("historyHost",
+                    ASCIIToUTF16(chrome::kChromeUIHistoryHost));
+  source->AddLocalizedString("historyDisplayName", IDS_HISTORY_TITLE);
+  source->AddString("settingsHost",
+                    ASCIIToUTF16(chrome::kChromeUISettingsHost));
+  source->AddLocalizedString("settingsDisplayName", IDS_SETTINGS_TITLE);
 
   return source;
 }
 
 }  // namespace
 
 UberUI::UberUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   Profile* profile = Profile::FromWebUI(web_ui);
   profile->GetChromeURLDataManager()->AddDataSource(CreateUberHTMLSource());
 
-  RegisterSubpage(chrome::kChromeUIUberFrameURL);
-  RegisterSubpage(chrome::kChromeUISettingsFrameURL);
   RegisterSubpage(chrome::kChromeUIExtensionsFrameURL);
   RegisterSubpage(chrome::kChromeUIHelpFrameURL);
+  RegisterSubpage(chrome::kChromeUIHistoryFrameURL);
+  RegisterSubpage(chrome::kChromeUISettingsFrameURL);
+  RegisterSubpage(chrome::kChromeUIUberFrameURL);
 }
 
 UberUI::~UberUI() {
   STLDeleteValues(&sub_uis_);
 }
 
 void UberUI::RegisterSubpage(const std::string& page_url) {
   content::WebUI* webui =
       web_ui()->GetWebContents()->CreateWebUI(GURL(page_url));
 
@@ skipping 44 matching lines @@
 // UberFrameUI
 
 UberFrameUI::UberFrameUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   Profile* profile = Profile::FromWebUI(web_ui);
   profile->GetChromeURLDataManager()->AddDataSource(
       CreateUberFrameHTMLSource());
 }
 
 UberFrameUI::~UberFrameUI() {
 }