chrome/browser/ui/webui/options/import_data_handler.h - Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/options/import_data_handler.h

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/webui/options/home_page_overlay_handler.cc ('k') | chrome/browser/ui/webui/options/import_data_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/import_data_handler.h

diff --git a/chrome/browser/ui/webui/options/import_data_handler.h b/chrome/browser/ui/webui/options/import_data_handler.h

index 99c990208e1463642fedf1f7ba86a054e73d6ce0..32bea2b08f3fbff9b502d511881ac860b04846f2 100644

--- a/chrome/browser/ui/webui/options/import_data_handler.h

+++ b/chrome/browser/ui/webui/options/import_data_handler.h

@@ -7,9 +7,10 @@

#include <stdint.h>

+#include <memory>

#include "base/compiler_specific.h"

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "chrome/browser/importer/importer_progress_observer.h"

#include "chrome/browser/ui/webui/options/options_ui.h"

#include "chrome/common/importer/importer_data_types.h"

@@ -56,7 +57,7 @@ class ImportDataHandler : public OptionsPageUIHandler,

// Opens a file selection dialog to choose the bookmarks HTML file.

void HandleChooseBookmarksFile(const base::ListValue* args);

- scoped_ptr<ImporterList> importer_list_;

+ std::unique_ptr<ImporterList> importer_list_;

// If non-null it means importing is in progress. ImporterHost takes care

// of deleting itself when import is complete.