ui/shell_dialogs/select_file_dialog.h - Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui

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: ui/shell_dialogs/select_file_dialog.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc

Patch Set: scopedptrui: rebase-make_scoped_ptr 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: ui/shell_dialogs/select_file_dialog.h

diff --git a/ui/shell_dialogs/select_file_dialog.h b/ui/shell_dialogs/select_file_dialog.h

index e89f686ceca08a87960cfc6e8e8910ef0f097c52..742658cbf6cc88b6cff5b6dabd1faabe4a7f72cc 100644

--- a/ui/shell_dialogs/select_file_dialog.h

+++ b/ui/shell_dialogs/select_file_dialog.h

@@ -5,6 +5,7 @@

#ifndef UI_SHELL_DIALOGS_SELECT_FILE_DIALOG_H_

#define UI_SHELL_DIALOGS_SELECT_FILE_DIALOG_H_

+#include <memory>

#include <string>

#include <vector>

@@ -12,7 +13,6 @@

#include "base/files/file_path.h"

#include "base/macros.h"

#include "base/memory/ref_counted.h"

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

#include "base/strings/string16.h"

#include "ui/gfx/native_widget_types.h"

#include "ui/shell_dialogs/base_shell_dialog.h"

@@ -208,7 +208,7 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog

// Returns true if the dialog has multiple file type choices.

virtual bool HasMultipleFileTypeChoicesImpl() = 0;

- scoped_ptr<SelectFilePolicy> select_file_policy_;

+ std::unique_ptr<SelectFilePolicy> select_file_policy_;

DISALLOW_COPY_AND_ASSIGN(SelectFileDialog);

};

« no previous file with comments | « ui/platform_window/win/win_window.cc ('k') | ui/snapshot/screenshot_grabber.h » ('j') | no next file with comments »