Add the scheme chrome-distiller:// and hook up data source.

chrome/browser/ui/webui/chrome_web_ui_controller_factory.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/chrome_web_ui_controller_factory.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 40 matching lines @@
 #include "chrome/browser/ui/webui/user_actions/user_actions_ui.h"
 #include "chrome/browser/ui/webui/version_ui.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/dom_distiller/content/dom_distiller_service_factory.h"
 #include "components/dom_distiller/core/dom_distiller_constants.h"
 #include "components/dom_distiller/core/dom_distiller_service.h"
 #include "components/dom_distiller/webui/dom_distiller_ui.h"
+#include "components/dom_distiller/webui/dom_distiller_viewer_ui.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/url_utils.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/feature_switch.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/web_dialogs/web_dialog_ui.h"
 #include "url/gurl.h"
 
@@ skipping 121 matching lines @@
 template<>
 WebUIController* NewWebUI<dom_distiller::DomDistillerUi>(WebUI* web_ui,
                                                          const GURL& url) {
   // The DomDistillerUi can not depend on components/dom_distiller/content,
   // so inject the correct DomDistillerService from chrome/.
   content::BrowserContext* browser_context =
       web_ui->GetWebContents()->GetBrowserContext();
   dom_distiller::DomDistillerService* service =
       dom_distiller::DomDistillerServiceFactory::GetForBrowserContext(
           browser_context);
-  return new dom_distiller::DomDistillerUi(web_ui, service, "dummy");
+  return new dom_distiller::DomDistillerUi(web_ui,
+                                           service,
+                                           chrome::kDomDistillerScheme);
+}
+
+template<>
+WebUIController* NewWebUI<dom_distiller::DomDistillerViewerUi>(
+    WebUI* web_ui,
+    const GURL& url) {
+  // The DomDistillerViewerUi can not depend on
+  // components/dom_distiller/content, so inject the correct DomDistillerService
+  // from chrome/.
+  content::BrowserContext* browser_context =
+      web_ui->GetWebContents()->GetBrowserContext();
+  dom_distiller::DomDistillerService* service =
+      dom_distiller::DomDistillerServiceFactory::GetForBrowserContext(
+          browser_context);
+  return new dom_distiller::DomDistillerViewerUi(web_ui, service);

[nyquist, 2013/12/04 23:56:56]

I think this can be added in the next CL instead. Sorry about that. I will
remove it in the next patch set. By removing the |service| argument, I think
this whole block can go away, as |web_ui| is given by default as an argument.

 }
 
 // Only create ExtensionWebUI for URLs that are allowed extension bindings,
 // hosted by actual tabs.
 bool NeedsExtensionWebUI(Profile* profile, const GURL& url) {
   ExtensionService* service = profile ? profile->GetExtensionService() : NULL;
   return service && service->ExtensionBindingsAllowed(url);
 }
 
 // Returns a function that can be used to create the right type of WebUI for a
 // tab, based on its URL. Returns NULL if the URL doesn't have WebUI associated
 // with it.
 WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
                                              Profile* profile,
                                              const GURL& url) {
 #if defined(ENABLE_EXTENSIONS)
   if (NeedsExtensionWebUI(profile, url))
     return &NewWebUI<ExtensionWebUI>;
 #endif
 
   // This will get called a lot to check all URLs, so do a quick check of other
   // schemes to filter out most URLs.
   if (!url.SchemeIs(chrome::kChromeDevToolsScheme) &&
       !url.SchemeIs(chrome::kChromeInternalScheme) &&
-      !url.SchemeIs(chrome::kChromeUIScheme)) {
+      !url.SchemeIs(chrome::kChromeUIScheme) &&
+      !url.SchemeIs(chrome::kDomDistillerScheme)) {
     return NULL;
   }
 
   // Special case the new tab page. In older versions of Chrome, the new tab
   // page was hosted at chrome-internal:<blah>. This might be in people's saved
   // sessions or bookmarks, so we say any URL with that scheme triggers the new
   // tab page.
   if (url.host() == chrome::kChromeUINewTabHost ||
       url.SchemeIs(chrome::kChromeInternalScheme)) {
     return &NewWebUI<NewTabUI>;
@@ skipping 246 matching lines @@
     return &NewWebUI<extensions::ExtensionsUI>;
 #endif
 #if defined(ENABLE_FULL_PRINTING)
   if (url.host() == chrome::kChromeUIPrintHost &&
       !profile->GetPrefs()->GetBoolean(prefs::kPrintPreviewDisabled))
     return &NewWebUI<PrintPreviewUI>;
 #endif
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableDomDistiller)) {
-    if (url.host() == dom_distiller::kChromeUIDomDistillerHost) {
+    if (url.SchemeIs(chrome::kDomDistillerScheme)) {
+      return &NewWebUI<dom_distiller::DomDistillerViewerUi>;
+    } else if (url.host() == dom_distiller::kChromeUIDomDistillerHost) {
       return &NewWebUI<dom_distiller::DomDistillerUi>;
     }
   }
 
   return NULL;
 }
 
 void RunFaviconCallbackAsync(
     const FaviconService::FaviconResultsCallback& callback,
     const std::vector<chrome::FaviconBitmapResult>* results) {
@@ skipping 157 matching lines @@
   if (page_url.host() == chrome::kChromeUIPluginsHost)
     return PluginsUI::GetFaviconResourceBytes(scale_factor);
 
   // Android doesn't use the components pages.
   if (page_url.host() == chrome::kChromeUIComponentsHost)
     return ComponentsUI::GetFaviconResourceBytes(scale_factor);
 #endif
 
   return NULL;
 }