[uber page] Integrate history into uber page.

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

Index: chrome/browser/ui/webui/uber/uber_ui.cc
===================================================================
--- chrome/browser/ui/webui/uber/uber_ui.cc	(revision 124713)
+++ chrome/browser/ui/webui/uber/uber_ui.cc	(working copy)
@@ -35,12 +35,22 @@
   // Hack alert: continue showing "Loading..." until a real title is set.
   source->AddLocalizedString("pageTitle", IDS_TAB_LOADING_TITLE);
 
+  source->AddString("historyHost",
+                    ASCIIToUTF16(chrome::kChromeUIHistoryHost));
+  source->AddString("historyFrameURL",
+                    ASCIIToUTF16(chrome::kChromeUIHistoryFrameURL));
+  source->AddString("extensionsHost",
+                    ASCIIToUTF16(chrome::kChromeUIExtensionsHost));
+  source->AddString("extensionsFrameURL",
+                    ASCIIToUTF16(chrome::kChromeUIExtensionsFrameURL));
   source->AddString("settingsHost",
                     ASCIIToUTF16(chrome::kChromeUISettingsHost));
-  source->AddString("extensionsHost",
-                    ASCIIToUTF16(chrome::kChromeUIExtensionsHost));
+  source->AddString("settingsFrameURL",
+                    ASCIIToUTF16(chrome::kChromeUISettingsFrameURL));
   source->AddString("helpHost",
                     ASCIIToUTF16(chrome::kChromeUIHelpHost));
+  source->AddString("helpFrameURL",
+                    ASCIIToUTF16(chrome::kChromeUIHelpFrameURL));
 
   return source;
 }
@@ -60,13 +70,16 @@
   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("historyHost",
+                    ASCIIToUTF16(chrome::kChromeUIHistoryHost));
+  source->AddLocalizedString("historyDisplayName", IDS_HISTORY_TITLE);
   source->AddString("extensionsHost",
                     ASCIIToUTF16(chrome::kChromeUIExtensionsHost));
   source->AddLocalizedString("extensionsDisplayName",
                              IDS_MANAGE_EXTENSIONS_SETTING_WINDOWS_TITLE);
+  source->AddString("settingsHost",
+                    ASCIIToUTF16(chrome::kChromeUISettingsHost));
+  source->AddLocalizedString("settingsDisplayName", IDS_SETTINGS_TITLE);
   source->AddString("helpHost",
                     ASCIIToUTF16(chrome::kChromeUIHelpHost));
   source->AddLocalizedString("helpDisplayName", IDS_HELP_TITLE);
@@ -81,8 +94,9 @@
   profile->GetChromeURLDataManager()->AddDataSource(CreateUberHTMLSource());
 
   RegisterSubpage(chrome::kChromeUIUberFrameURL);

[Evan Stade, 2012/03/02 23:29:54]

I would alphabetize these instead but I don't feel strongly. The order here is
not obvious, also if someone were to move the order of the pages in the HTML I
highly doubt they'd think to hunt this down and change it, so it will get out of
sync.

[csilv, 2012/03/02 23:48:09]

Done.

+  RegisterSubpage(chrome::kChromeUIHistoryFrameURL);
+  RegisterSubpage(chrome::kChromeUIExtensionsFrameURL);
   RegisterSubpage(chrome::kChromeUISettingsFrameURL);
-  RegisterSubpage(chrome::kChromeUIExtensionsFrameURL);
   RegisterSubpage(chrome::kChromeUIHelpFrameURL);
 }