[uber] make the navigation controls an iframe

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

Index: chrome/browser/ui/webui/uber/uber_ui.cc
diff --git a/chrome/browser/ui/webui/uber/uber_ui.cc b/chrome/browser/ui/webui/uber/uber_ui.cc
index f3378ad8bb4cb19d5d5068a7f635a88cebe9084b..c41c7a6597b05f176b21dd51469f51ac4a33444e 100644
--- a/chrome/browser/ui/webui/uber/uber_ui.cc
+++ b/chrome/browser/ui/webui/uber/uber_ui.cc
@@ -29,8 +29,32 @@ ChromeWebUIDataSource* CreateUberHTMLSource() {
 
   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("settingsHost",
+                    ASCIIToUTF16(chrome::kChromeUISettingsHost));
+  source->AddString("extensionsHost",
+                    ASCIIToUTF16(chrome::kChromeUIExtensionsHost));
+
+#if defined(OS_CHROMEOS)
+  source->AddString("aboutPageHost",
+                    ASCIIToUTF16(chrome::kAboutOptionsSubPage));
+#endif
+  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);
+
   source->AddLocalizedString("shortProductName", IDS_SHORT_PRODUCT_NAME);
 
   source->AddString("settingsHost",
@@ -40,12 +64,12 @@ ChromeWebUIDataSource* CreateUberHTMLSource() {
                     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;
 }
 
@@ -55,6 +79,7 @@ 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);
 #if defined(OS_CHROMEOS)
@@ -113,3 +138,14 @@ bool UberUI::OverrideHandleWebUIMessage(const GURL& source_url,
   subpage->second->ProcessWebUIMessage(source_url, message, args);
   return true;
 }
+
+// UberFrameUI
+
+UberFrameUI::UberFrameUI(content::WebUI* web_ui) : WebUIController(web_ui) {
+  Profile* profile = Profile::FromWebUI(web_ui);
+  profile->GetChromeURLDataManager()->AddDataSource(
+      CreateUberFrameHTMLSource());
+}
+
+UberFrameUI::~UberFrameUI() {
+}