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

Index: chrome/browser/ui/app_list/search/search_resource_manager.cc

diff --git a/chrome/browser/ui/app_list/search/search_resource_manager.cc b/chrome/browser/ui/app_list/search/search_resource_manager.cc

index 439c94ac0df3eb268e95aaa72e023094c5bcd3d5..97d651d88aa9f5c5ed6418509d5d2018d9bceb72 100644

--- a/chrome/browser/ui/app_list/search/search_resource_manager.cc

+++ b/chrome/browser/ui/app_list/search/search_resource_manager.cc

@@ -4,6 +4,7 @@

#include "chrome/browser/ui/app_list/search/search_resource_manager.h"

+#include "base/memory/ptr_util.h"

#include "chrome/browser/ui/app_list/start_page_service.h"

#include "grit/components_scaled_resources.h"

#include "grit/generated_resources.h"

@@ -17,13 +18,13 @@ namespace app_list {

namespace {

-scoped_ptr<SearchBoxModel::SpeechButtonProperty> CreateNewProperty(

+std::unique_ptr<SearchBoxModel::SpeechButtonProperty> CreateNewProperty(

SpeechRecognitionState state) {

if (state == SPEECH_RECOGNITION_OFF)

return nullptr;

ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();

- return make_scoped_ptr(new SearchBoxModel::SpeechButtonProperty(

+ return base::WrapUnique(new SearchBoxModel::SpeechButtonProperty(

*bundle.GetImageSkiaNamed(IDR_APP_LIST_MIC_HOTWORD_ON),

l10n_util::GetStringUTF16(IDS_APP_LIST_HOTWORD_LISTENING),

*bundle.GetImageSkiaNamed(IDR_APP_LIST_MIC_HOTWORD_OFF),