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

Unified Diff: chrome/browser/ui/pdf/pdf_unsupported_feature.cc

Issue 1865213004: Convert //chrome/browser/ui 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
« no previous file with comments | « chrome/browser/ui/pdf/adobe_reader_info_win.cc ('k') | chrome/browser/ui/prefs/prefs_tab_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/pdf/pdf_unsupported_feature.cc
diff --git a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
index 092b7a8dc3eaa5eff71c30539a423e6d6d066e8b..9a317a3377bfa18a4fe5677981191898a2609a08 100644
--- a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
+++ b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
@@ -4,11 +4,12 @@
#include "chrome/browser/ui/pdf/pdf_unsupported_feature.h"
+#include <memory>
#include <utility>
#include "base/bind.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
#include "chrome/browser/lifetime/application_lifetime.h"
@@ -146,7 +147,7 @@ void OpenUsingReader(WebContents* web_contents,
pdf::PDFWebContentsHelper* pdf_tab_helper =
pdf::PDFWebContentsHelper::FromWebContents(web_contents);
if (client)
- pdf_tab_helper->ShowOpenInReaderPrompt(make_scoped_ptr(client));
+ pdf_tab_helper->ShowOpenInReaderPrompt(base::WrapUnique(client));
}
// An interstitial to be used when the user chooses to open a PDF using Adobe
@@ -325,7 +326,7 @@ void MaybeShowOpenPDFInReaderPrompt(WebContents* web_contents,
if (!reader_info.is_installed || !reader_info.is_enabled)
return;
- scoped_ptr<pdf::OpenPDFInReaderPromptClient> prompt(
+ std::unique_ptr<pdf::OpenPDFInReaderPromptClient> prompt(
new PDFUnsupportedFeaturePromptClient(web_contents, reader_info));
pdf::PDFWebContentsHelper* pdf_tab_helper =
pdf::PDFWebContentsHelper::FromWebContents(web_contents);
« no previous file with comments | « chrome/browser/ui/pdf/adobe_reader_info_win.cc ('k') | chrome/browser/ui/prefs/prefs_tab_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698