ui/app_list/search/dictionary_data_store.cc - Issue 1394993004: Make ValueDeserializer::Deserialize return scoped_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: ui/app_list/search/dictionary_data_store.cc

Issue 1394993004: Make ValueDeserializer::Deserialize return scoped_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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

« chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc ('K') | « rlz/chromeos/lib/rlz_value_store_chromeos.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/app_list/search/dictionary_data_store.cc

diff --git a/ui/app_list/search/dictionary_data_store.cc b/ui/app_list/search/dictionary_data_store.cc

index 45f53ca6edb58101530b4cc03cf1e5416218c06c..e74f7a5fef5a86516be5dba4d6bb2333e7ccbab9 100644

--- a/ui/app_list/search/dictionary_data_store.cc

+++ b/ui/app_list/search/dictionary_data_store.cc

@@ -67,7 +67,8 @@ scoped_ptr<base::DictionaryValue> DictionaryDataStore::LoadOnBlockingPool() {

int error_code = JSONFileValueDeserializer::JSON_NO_ERROR;

std::string error_message;

JSONFileValueDeserializer deserializer(data_file_);

- base::Value* value = deserializer.Deserialize(&error_code, &error_message);

+ base::Value* value =

+ deserializer.Deserialize(&error_code, &error_message).release();

base::DictionaryValue* dict_value = NULL;

if (error_code != JSONFileValueDeserializer::JSON_NO_ERROR || !value ||

!value->GetAsDictionary(&dict_value) || !dict_value) {

« chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc ('K') | « rlz/chromeos/lib/rlz_value_store_chromeos.cc ('k') | no next file » | no next file with comments »