Add support for distilling arbitrary URLs in DOM Distiller Viewer.

components/dom_distiller/webui/dom_distiller_handler.cc

 // Copyright 2013 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 "components/dom_distiller/webui/dom_distiller_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
+#include "base/guid.h"
 #include "base/values.h"
 #include "components/dom_distiller/core/dom_distiller_service.h"
 #include "components/dom_distiller/core/proto/distilled_page.pb.h"
+#include "components/dom_distiller/core/url_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
+#include "net/base/escape.h"
+#include "net/base/url_util.h"
 #include "url/gurl.h"
 
 namespace dom_distiller {
 
 DomDistillerHandler::DomDistillerHandler(DomDistillerService* service,
                                          const std::string& scheme)
     : service_(service), article_scheme_(scheme), weak_ptr_factory_(this) {}
 
 DomDistillerHandler::~DomDistillerHandler() {}
 
 void DomDistillerHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback(
       "requestEntries",
       base::Bind(&DomDistillerHandler::HandleRequestEntries,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "addArticle",
       base::Bind(&DomDistillerHandler::HandleAddArticle,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "selectArticle",
       base::Bind(&DomDistillerHandler::HandleSelectArticle,
                  base::Unretained(this)));
+  web_ui()->RegisterMessageCallback(
+      "viewUrl",
+      base::Bind(&DomDistillerHandler::HandleViewUrl, base::Unretained(this)));
 }
 
 void DomDistillerHandler::HandleAddArticle(const base::ListValue* args) {
   std::string url;
   args->GetString(0, &url);
   GURL gurl(url);
   if (gurl.is_valid()) {
     service_->AddToList(
         gurl,
         base::Bind(base::Bind(&DomDistillerHandler::OnArticleAdded,
                               base::Unretained(this))));
   } else {
     web_ui()->CallJavascriptFunction("domDistiller.onArticleAddFailed");
   }
 }
 
+void DomDistillerHandler::HandleViewUrl(const base::ListValue* args) {
+  std::string url;
+  args->GetString(0, &url);
+  GURL gurl(url);
+  if (gurl.is_valid()) {
+    GURL view_url(article_scheme_ + "://" + base::GenerateGUID() + "/?" +

[shashi, 2014/02/25 21:48:08]

Probably want to use the GetDistillerViewUrl* functions here.

[nyquist, 2014/02/27 00:07:37]

Done.

+                  std::string(kUrlKey) + "=" +
+                  net::EscapeQueryParamValue(gurl.spec(), true));
+    DCHECK(view_url.is_valid());
+    web_ui()->GetWebContents()->GetController().LoadURL(
+        view_url,
+        content::Referrer(),
+        content::PAGE_TRANSITION_GENERATED,
+        std::string());
+  } else {
+    web_ui()->CallJavascriptFunction("domDistiller.onViewUrlFailed");
+  }
+}
+
 void DomDistillerHandler::HandleSelectArticle(const base::ListValue* args) {
   std::string entry_id;
   args->GetString(0, &entry_id);
-  GURL url(article_scheme_ + std::string("://") + entry_id);
+  GURL url(article_scheme_ + "://" + base::GenerateGUID() + "/?" +

[shashi, 2014/02/25 21:48:08]

Probably want to use the GetDistillerViewUrl* functions here.

[nyquist, 2014/02/27 00:07:37]

Done.

+           std::string(kEntryIdKey) + "=" +
+           net::EscapeQueryParamValue(entry_id, true));
   DCHECK(url.is_valid());
-  web_ui()->GetWebContents()->GetController().LoadURL(url,
-      content::Referrer(), content::PAGE_TRANSITION_GENERATED,
+  web_ui()->GetWebContents()->GetController().LoadURL(
+      url,
+      content::Referrer(),
+      content::PAGE_TRANSITION_GENERATED,
       std::string());
 }
 
 void DomDistillerHandler::HandleRequestEntries(const base::ListValue* args) {
   base::ListValue entries;
   const std::vector<ArticleEntry>& entries_specifics = service_->GetEntries();
   for (std::vector<ArticleEntry>::const_iterator it = entries_specifics.begin();
        it != entries_specifics.end();
        ++it) {
     const ArticleEntry& article = *it;
@@ skipping 11 matching lines @@
 
 void DomDistillerHandler::OnArticleAdded(bool article_available) {
   // TODO(nyquist): Update this function.
   if (article_available) {
     HandleRequestEntries(NULL);
   } else {
     web_ui()->CallJavascriptFunction("domDistiller.onArticleAddFailed");
   }
 }
 
+const GURL DomDistillerHandler::GetDistillerViewUrlFromEntryId(

[shashi, 2014/02/25 21:48:08]

Is this function used anywhere?

[cjhopman, 2014/02/25 22:25:14]

Looks like this is also defined in the tests.

[nyquist, 2014/02/27 00:07:37]

Done.
Created dom_distiller::url_utils for this and put it in
//components/dom_distiller/core.

+    const std::string& entry_id) const {
+  GURL url(article_scheme_ + "://" + base::GenerateGUID());
+  return net::AppendOrReplaceQueryParameter(url, kEntryIdKey, entry_id);
+}
+
+const GURL DomDistillerHandler::GetDistillerViewUrlFromUrl(const GURL& view_url)
+    const {
+  GURL url(article_scheme_ + "://" + base::GenerateGUID());

[shashi, 2014/02/25 21:48:08]

Same for this function.

[nyquist, 2014/02/27 00:07:37]

Done.

+  return net::AppendOrReplaceQueryParameter(url, kUrlKey, view_url.spec());
+}
+
 }  // namespace dom_distiller