chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc - 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/libgtk2ui/select_file_dialog_impl_gtk2.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

Index: chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc

diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc

index 249cb664541cd16dd7a7b64ce55b8f3022f33d7c..95f9a448378e6fb26e64a904fa3117dfbd12a730 100644

--- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc

+++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc

@@ -11,6 +11,7 @@

#include <unistd.h>

#include <map>

+#include <memory>

#include <set>

#include <vector>

@@ -18,7 +19,6 @@

#undef RootWindow

#include "base/logging.h"

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

#include "base/message_loop/message_loop.h"

#include "base/strings/string_util.h"

#include "base/strings/sys_string_conversions.h"

@@ -186,7 +186,7 @@ void SelectFileDialogImplGTK::AddFilters(GtkFileChooser* chooser) {

if (!current_extension.empty()) {

if (!filter)

filter = gtk_file_filter_new();

- scoped_ptr<std::string> file_extension(

+ std::unique_ptr<std::string> file_extension(

new std::string("." + current_extension));

fallback_labels.insert(std::string("*").append(*file_extension));

gtk_file_filter_add_custom(

« no previous file with comments | « chrome/browser/ui/libgtk2ui/select_file_dialog_impl.cc ('k') | chrome/browser/ui/libgtk2ui/unity_service.cc » ('j') | no next file with comments »