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

Side by Side Diff: ios/chrome/browser/dom_distiller/distiller_viewer.cc

Issue 1586833002: Convert Pass()→std::move() for iOS build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert accidental //base change Created 4 years, 11 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "ios/chrome/browser/dom_distiller/distiller_viewer.h" 5 #include "ios/chrome/browser/dom_distiller/distiller_viewer.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility>
8 9
9 #include "components/dom_distiller/core/distilled_page_prefs.h" 10 #include "components/dom_distiller/core/distilled_page_prefs.h"
10 #include "components/dom_distiller/core/dom_distiller_request_view_base.h" 11 #include "components/dom_distiller/core/dom_distiller_request_view_base.h"
11 #include "components/dom_distiller/core/dom_distiller_service.h" 12 #include "components/dom_distiller/core/dom_distiller_service.h"
12 #include "components/dom_distiller/core/proto/distilled_article.pb.h" 13 #include "components/dom_distiller/core/proto/distilled_article.pb.h"
13 #include "components/dom_distiller/core/task_tracker.h" 14 #include "components/dom_distiller/core/task_tracker.h"
14 #include "components/dom_distiller/core/viewer.h" 15 #include "components/dom_distiller/core/viewer.h"
15 #include "ios/chrome/browser/dom_distiller/dom_distiller_service_factory.h" 16 #include "ios/chrome/browser/dom_distiller/dom_distiller_service_factory.h"
16 #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state. h" 17 #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state. h"
17 #include "ui/gfx/geometry/size.h" 18 #include "ui/gfx/geometry/size.h"
18 19
19 namespace dom_distiller { 20 namespace dom_distiller {
20 21
21 DistillerViewer::DistillerViewer(ios::ChromeBrowserState* browser_state, 22 DistillerViewer::DistillerViewer(ios::ChromeBrowserState* browser_state,
22 const GURL& url, 23 const GURL& url,
23 const DistillationFinishedCallback& callback) 24 const DistillationFinishedCallback& callback)
24 : DomDistillerRequestViewBase( 25 : DomDistillerRequestViewBase(
25 new DistilledPagePrefs(browser_state->GetPrefs())), 26 new DistilledPagePrefs(browser_state->GetPrefs())),
26 url_(url), 27 url_(url),
27 callback_(callback) { 28 callback_(callback) {
28 DCHECK(browser_state); 29 DCHECK(browser_state);
29 DCHECK(url.is_valid()); 30 DCHECK(url.is_valid());
30 dom_distiller::DomDistillerService* distillerService = 31 dom_distiller::DomDistillerService* distillerService =
31 dom_distiller::DomDistillerServiceFactory::GetForBrowserState( 32 dom_distiller::DomDistillerServiceFactory::GetForBrowserState(
32 browser_state); 33 browser_state);
33 34
34 scoped_ptr<ViewerHandle> viewer_handle = distillerService->ViewUrl( 35 scoped_ptr<ViewerHandle> viewer_handle = distillerService->ViewUrl(
35 this, distillerService->CreateDefaultDistillerPage(gfx::Size()), url); 36 this, distillerService->CreateDefaultDistillerPage(gfx::Size()), url);
36 37
37 TakeViewerHandle(viewer_handle.Pass()); 38 TakeViewerHandle(std::move(viewer_handle));
38 } 39 }
39 40
40 DistillerViewer::~DistillerViewer() { 41 DistillerViewer::~DistillerViewer() {
41 } 42 }
42 43
43 void DistillerViewer::OnArticleReady( 44 void DistillerViewer::OnArticleReady(
44 const dom_distiller::DistilledArticleProto* article_proto) { 45 const dom_distiller::DistilledArticleProto* article_proto) {
45 DomDistillerRequestViewBase::OnArticleReady(article_proto); 46 DomDistillerRequestViewBase::OnArticleReady(article_proto);
46 47
47 const std::string html = viewer::GetUnsafeArticleTemplateHtml( 48 const std::string html = viewer::GetUnsafeArticleTemplateHtml(
48 url_.spec(), distilled_page_prefs_->GetTheme(), 49 url_.spec(), distilled_page_prefs_->GetTheme(),
49 distilled_page_prefs_->GetFontFamily()); 50 distilled_page_prefs_->GetFontFamily());
50 51
51 std::string html_and_script(html); 52 std::string html_and_script(html);
52 html_and_script += 53 html_and_script +=
53 "<script> distiller_on_ios = true; " + js_buffer_ + "</script>"; 54 "<script> distiller_on_ios = true; " + js_buffer_ + "</script>";
54 callback_.Run(url_, html_and_script); 55 callback_.Run(url_, html_and_script);
55 } 56 }
56 57
57 void DistillerViewer::SendJavaScript(const std::string& buffer) { 58 void DistillerViewer::SendJavaScript(const std::string& buffer) {
58 js_buffer_ += buffer; 59 js_buffer_ += buffer;
59 } 60 }
60 61
61 } // namespace dom_distiller 62 } // namespace dom_distiller
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698