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

Index: chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

index 14ee3d5820444827d07f75c586bb4ddbb6a9c6da..03f14f8f123aaf5b29c95b94a709e3588b08efc7 100644

--- a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

@@ -137,7 +137,7 @@ base::ListValue* CrosLanguageOptionsHandler::GetInputMethodList() {

input_method::InputMethodManager* manager =

input_method::InputMethodManager::Get();

// GetSupportedInputMethods() never return NULL.

- scoped_ptr<input_method::InputMethodDescriptors> descriptors(

+ std::unique_ptr<input_method::InputMethodDescriptors> descriptors(

manager->GetSupportedInputMethods());

base::ListValue* input_method_list = new base::ListValue();

@@ -171,15 +171,16 @@ base::ListValue*

const input_method::InputMethodDescriptors& descriptors) {

input_method::InputMethodUtil* util =

input_method::InputMethodManager::Get()->GetInputMethodUtil();

- scoped_ptr<base::ListValue> ime_ids_list(new base::ListValue());

+ std::unique_ptr<base::ListValue> ime_ids_list(new base::ListValue());

for (size_t i = 0; i < descriptors.size(); ++i) {

const input_method::InputMethodDescriptor& descriptor = descriptors[i];

- scoped_ptr<base::DictionaryValue> dictionary(new base::DictionaryValue());

+ std::unique_ptr<base::DictionaryValue> dictionary(

+ new base::DictionaryValue());

dictionary->SetString("id", descriptor.id());

dictionary->SetString(

"displayName", util->GetLocalizedDisplayName(descriptor));

dictionary->SetString("optionsPage", descriptor.options_page_url().spec());

- scoped_ptr<base::DictionaryValue> language_codes(

+ std::unique_ptr<base::DictionaryValue> language_codes(

new base::DictionaryValue());

for (size_t i = 0; i < descriptor.language_codes().size(); ++i)

language_codes->SetBoolean(descriptor.language_codes().at(i), true);