chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.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/app_list/search/launcher_search/launcher_search_provider.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/app_list/search/launcher_search/launcher_search_icon_image_loader_unittest.cc ('k') | chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h

diff --git a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h

index bca8c62947ef28edc3e4c048710c7336f778877d..ed10e9c86a5cf03be7271236840d5e4b54f7c0e2 100644

--- a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h

+++ b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h

@@ -6,9 +6,9 @@

#define CHROME_BROWSER_UI_APP_LIST_SEARCH_LAUNCHER_SEARCH_LAUNCHER_SEARCH_PROVIDER_H_

#include <map>

+#include <memory>

#include "base/macros.h"

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

#include "base/memory/scoped_vector.h"

#include "base/stl_util.h"

#include "base/strings/string16.h"

@@ -43,7 +43,8 @@ class LauncherSearchProvider : public SearchProvider {

// The search results of each extension.

std::map<extensions::ExtensionId,

- scoped_ptr<ScopedVector<LauncherSearchResult>>> extension_results_;

+ std::unique_ptr<ScopedVector<LauncherSearchResult>>>

+ extension_results_;

// A timer to delay query.

base::OneShotTimer query_timer_;