Enable history and downloads by default, port NewTabUI from DOMUIHost to DOMU...

chrome/browser/dom_ui/dom_ui_contents.cc

 // Copyright (c) 2006-2008 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/dom_ui/dom_ui_contents.h"
 
+#include "chrome/browser/debugger/debugger_contents.h"
 #include "chrome/browser/dom_ui/dom_ui.h"
+#include "chrome/browser/dom_ui/downloads_ui.h"
 #include "chrome/browser/dom_ui/history_ui.h"
-#include "chrome/browser/dom_ui/downloads_ui.h"
+#include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/common/resource_bundle.h"
 
 // The scheme used for DOMUIContentses
 // TODO(glen): Merge this with the scheme in chrome_url_data_manager
 static const char kURLScheme[] = "chrome-ui";
 
 // The path used in internal URLs to thumbnail data.
 static const char kThumbnailPath[] = "thumb";
@@ skipping 47 matching lines @@
       default_favicon_ = new RefCountedBytes;
       ResourceBundle::GetSharedInstance().LoadImageResourceBytes(
           IDR_DEFAULT_FAVICON, &default_favicon_->data);
     }
 
     SendResponse(request_id, default_favicon_);
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// ThumbnailSource 
+// ThumbnailSource
 
 ThumbnailSource::ThumbnailSource(Profile* profile)
     : DataSource(kThumbnailPath, MessageLoop::current()), profile_(profile) {}
 
 void ThumbnailSource::StartDataRequest(const std::string& path,
                                        int request_id) {
   HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
   if (hs) {
     HistoryService::Handle handle = hs->GetPageThumbnail(
         GURL(path),
@@ skipping 28 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // DOMUIContents
 
 // This is the top-level URL handler for chrome-ui: URLs, and exposed in
 // our header file. The individual DOMUIs provide a chrome-ui:// HTML source
 // at the same host/path.
 bool DOMUIContentsCanHandleURL(GURL* url,
                                TabContentsType* result_type) {
-  if (!url->SchemeIs(kURLScheme))
-    return false;
-
-  // TODO: remove once the debugger is using DOMContentsUI
-  if (url->host().compare("inspector") == 0 && 
-      url->path().compare("/debugger.html") == 0)
+  // chrome-internal is a scheme we used to use for the new tab page.
+  if (!url->SchemeIs(kURLScheme) && !url->SchemeIs("chrome-internal"))
     return false;
 
   *result_type = TAB_CONTENTS_DOM_UI;
   return true;
 }
 
 DOMUIContents::DOMUIContents(Profile* profile,
                              SiteInstance* instance,
                              RenderViewHostFactory* render_view_factory)
     : WebContents(profile,
@@ skipping 22 matching lines @@
 
 WebPreferences DOMUIContents::GetWebkitPrefs() {
   // Get the users preferences then force image loading to always be on.
   WebPreferences web_prefs = WebContents::GetWebkitPrefs();
   web_prefs.loads_images_automatically = true;
   web_prefs.javascript_enabled = true;
 
   return web_prefs;
 }
 
+bool DOMUIContents::ShouldDisplayFavIcon() {
+  if (current_ui_)
+    return current_ui_->ShouldDisplayFavIcon();
+  return true;
+}
+
+bool DOMUIContents::IsBookmarkBarAlwaysVisible() {
+  if (current_ui_)
+    return current_ui_->IsBookmarkBarAlwaysVisible();
+  return false;
+}
+
+void DOMUIContents::SetInitialFocus() {
+  if (current_ui_)
+    current_ui_->SetInitialFocus();
+}
+
+bool DOMUIContents::ShouldDisplayURL() {
+  if (current_ui_)
+    return current_ui_->ShouldDisplayURL();
+  return true;
+}
+
+void DOMUIContents::RequestOpenURL(const GURL& url, const GURL& referrer,
+                                   WindowOpenDisposition disposition) {
+  if (current_ui_)
+    current_ui_->RequestOpenURL(url, referrer, disposition);
+}
+
 bool DOMUIContents::NavigateToPendingEntry(bool reload) {
   if (current_ui_) {
     // Shut down our existing DOMUI.
     delete current_ui_;
     current_ui_ = NULL;
   }
 
   // Set up a new DOMUI.
   NavigationEntry* pending_entry = controller()->GetPendingEntry();
   current_ui_ = GetDOMUIForURL(pending_entry->url());
   if (current_ui_)
     current_ui_->Init();
   else
     return false;
 
   // Let WebContents do whatever it's meant to do.
   return WebContents::NavigateToPendingEntry(reload);
 }
 
-DOMUI* DOMUIContents::GetDOMUIForURL(const GURL &url) {
-#if defined(OS_WIN)
-// TODO(port): Include when history and downloads are HTML UI.
-  if (url.host() == HistoryUI::GetBaseURL().host())
-    return new HistoryUI(this);
-  else if (url.host() == DownloadsUI::GetBaseURL().host())
-    return new DownloadsUI(this);
-#else
-  NOTIMPLEMENTED();
-#endif
-
-  return NULL;
-}
-
 void DOMUIContents::ProcessDOMUIMessage(const std::string& message,
                                         const std::string& content) {
   DCHECK(current_ui_);
   current_ui_->ProcessDOMUIMessage(message, content);
 }
 
 // static
 const std::string DOMUIContents::GetScheme() {
   return kURLScheme;
 }
 
+DOMUI* DOMUIContents::GetDOMUIForURL(const GURL &url) {
+#if defined(OS_WIN)
+// TODO(port): include this once these are converted to HTML
+  if (url.host() == NewTabUI::GetBaseURL().host() ||
+    url.SchemeIs("chrome-internal")) {
+    return new NewTabUI(this);
+  } else if (url.host() == HistoryUI::GetBaseURL().host()) {
+    return new HistoryUI(this);
+  } else if (url.host() == DownloadsUI::GetBaseURL().host()) {
+    return new DownloadsUI(this);
+  } else if (url.host() == DebuggerContents::GetBaseURL().host()) {
+    return new DebuggerContents(this);
+  }
+#else
+  NOTIMPLEMENTED();
+#endif
+  return NULL;
+}