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

Unified Diff: components/dom_distiller/content/browser/dom_distiller_viewer_source.cc

Issue 1879613003: Convert //components/dom_distiller from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
diff --git a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
index 3ce7d160b645f3c106394a64ff5c2dba868c1633..f63168163ad8f2325d6fbb6d5b22a539eb47c702 100644
--- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
+++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
@@ -4,12 +4,12 @@
#include "components/dom_distiller/content/browser/dom_distiller_viewer_source.h"
+#include <memory>
#include <string>
#include <utility>
#include <vector>
#include "base/memory/ref_counted_memory.h"
-#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/metrics/user_metrics.h"
#include "base/strings/string_number_conversions.h"
@@ -169,7 +169,7 @@ void DomDistillerViewerSource::RequestViewerHandle::DidFinishLoad(
DomDistillerViewerSource::DomDistillerViewerSource(
DomDistillerServiceInterface* dom_distiller_service,
const std::string& scheme,
- scoped_ptr<DistillerUIHandle> ui_handle)
+ std::unique_ptr<DistillerUIHandle> ui_handle)
: scheme_(scheme),
dom_distiller_service_(dom_distiller_service),
distiller_ui_handle_(std::move(ui_handle)) {}
@@ -221,7 +221,7 @@ void DomDistillerViewerSource::StartDataRequest(
RequestViewerHandle* request_viewer_handle =
new RequestViewerHandle(web_contents, scheme_, path_after_query_separator,
dom_distiller_service_->GetDistilledPagePrefs());
- scoped_ptr<ViewerHandle> viewer_handle = viewer::CreateViewRequest(
+ std::unique_ptr<ViewerHandle> viewer_handle = viewer::CreateViewRequest(
dom_distiller_service_, path, request_viewer_handle,
web_contents->GetContainerBounds().size());

Powered by Google App Engine
This is Rietveld 408576698