Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Side by Side Diff: components/dom_distiller/webui/dom_distiller_handler.cc

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/dom_distiller/webui/dom_distiller_handler.h" 5 #include "components/dom_distiller/webui/dom_distiller_handler.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 web_ui()->CallJavascriptFunction("domDistiller.onArticleAddFailed"); 73 web_ui()->CallJavascriptFunction("domDistiller.onArticleAddFailed");
74 } 74 }
75 } 75 }
76 76
77 void DomDistillerHandler::HandleViewUrl(const base::ListValue* args) { 77 void DomDistillerHandler::HandleViewUrl(const base::ListValue* args) {
78 GURL view_url = GetViewUrlFromArgs(article_scheme_, args); 78 GURL view_url = GetViewUrlFromArgs(article_scheme_, args);
79 if (view_url.is_valid()) { 79 if (view_url.is_valid()) {
80 web_ui()->GetWebContents()->GetController().LoadURL( 80 web_ui()->GetWebContents()->GetController().LoadURL(
81 view_url, 81 view_url,
82 content::Referrer(), 82 content::Referrer(),
83 content::PAGE_TRANSITION_GENERATED, 83 ui::PAGE_TRANSITION_GENERATED,
84 std::string()); 84 std::string());
85 } else { 85 } else {
86 web_ui()->CallJavascriptFunction("domDistiller.onViewUrlFailed"); 86 web_ui()->CallJavascriptFunction("domDistiller.onViewUrlFailed");
87 } 87 }
88 } 88 }
89 89
90 void DomDistillerHandler::HandleSelectArticle(const base::ListValue* args) { 90 void DomDistillerHandler::HandleSelectArticle(const base::ListValue* args) {
91 std::string entry_id; 91 std::string entry_id;
92 args->GetString(0, &entry_id); 92 args->GetString(0, &entry_id);
93 GURL url = 93 GURL url =
94 url_utils::GetDistillerViewUrlFromEntryId(article_scheme_, entry_id); 94 url_utils::GetDistillerViewUrlFromEntryId(article_scheme_, entry_id);
95 DCHECK(url.is_valid()); 95 DCHECK(url.is_valid());
96 web_ui()->GetWebContents()->GetController().LoadURL( 96 web_ui()->GetWebContents()->GetController().LoadURL(
97 url, 97 url,
98 content::Referrer(), 98 content::Referrer(),
99 content::PAGE_TRANSITION_GENERATED, 99 ui::PAGE_TRANSITION_GENERATED,
100 std::string()); 100 std::string());
101 } 101 }
102 102
103 void DomDistillerHandler::HandleRequestEntries(const base::ListValue* args) { 103 void DomDistillerHandler::HandleRequestEntries(const base::ListValue* args) {
104 base::ListValue entries; 104 base::ListValue entries;
105 const std::vector<ArticleEntry>& entries_specifics = service_->GetEntries(); 105 const std::vector<ArticleEntry>& entries_specifics = service_->GetEntries();
106 for (std::vector<ArticleEntry>::const_iterator it = entries_specifics.begin(); 106 for (std::vector<ArticleEntry>::const_iterator it = entries_specifics.begin();
107 it != entries_specifics.end(); 107 it != entries_specifics.end();
108 ++it) { 108 ++it) {
109 const ArticleEntry& article = *it; 109 const ArticleEntry& article = *it;
(...skipping 13 matching lines...) Expand all
123 void DomDistillerHandler::OnArticleAdded(bool article_available) { 123 void DomDistillerHandler::OnArticleAdded(bool article_available) {
124 // TODO(nyquist): Update this function. 124 // TODO(nyquist): Update this function.
125 if (article_available) { 125 if (article_available) {
126 HandleRequestEntries(NULL); 126 HandleRequestEntries(NULL);
127 } else { 127 } else {
128 web_ui()->CallJavascriptFunction("domDistiller.onArticleAddFailed"); 128 web_ui()->CallJavascriptFunction("domDistiller.onArticleAddFailed");
129 } 129 }
130 } 130 }
131 131
132 } // namespace dom_distiller 132 } // namespace dom_distiller
OLDNEW
« no previous file with comments | « components/dom_distiller/content/distiller_page_web_contents_browsertest.cc ('k') | components/navigation_interception.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698