chrome/browser/ui/app_list/app_list_syncable_service.cc - Issue 2845113002: Remove raw base::DictionaryValue::SetWithoutPathExpansion in //chrome

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/app_list_syncable_service.cc

Issue 2845113002: Remove raw base::DictionaryValue::SetWithoutPathExpansion in //chrome (Closed)

Patch Set: Address comments Created 3 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/supervised_user/supervised_user_whitelist_service.cc ('k') | chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/app_list/app_list_syncable_service.cc

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

index f25150242595992a2d816758fc21ee9b056b48a9..8e2bba1606b1e91caa6ae5953ae49ed81ce21b88 100644

--- a/chrome/browser/ui/app_list/app_list_syncable_service.cc

+++ b/chrome/browser/ui/app_list/app_list_syncable_service.cc

@@ -11,11 +11,18 @@

#include "base/memory/ptr_util.h"

#include "base/stl_util.h"

#include "base/strings/string_util.h"

+#include "base/values.h"

#include "build/build_config.h"

#include "chrome/browser/apps/drive/drive_app_provider.h"

+#include "chrome/browser/chromeos/arc/arc_util.h"

+#include "chrome/browser/chromeos/file_manager/app_id.h"

+#include "chrome/browser/chromeos/genius_app/app_id.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/profiles/profile.h"

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

+#include "chrome/browser/ui/app_list/arc/arc_app_item.h"

+#include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"

+#include "chrome/browser/ui/app_list/arc/arc_app_model_builder.h"

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

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

#include "chrome/common/chrome_switches.h"

@@ -38,12 +45,6 @@

#include "ui/app_list/app_list_model_observer.h"

#include "ui/app_list/app_list_switches.h"

#include "ui/base/l10n/l10n_util.h"

-#include "chrome/browser/chromeos/arc/arc_util.h"

-#include "chrome/browser/chromeos/file_manager/app_id.h"

-#include "chrome/browser/chromeos/genius_app/app_id.h"

-#include "chrome/browser/ui/app_list/arc/arc_app_item.h"

-#include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"

-#include "chrome/browser/ui/app_list/arc/arc_app_model_builder.h"

using syncer::SyncChange;

@@ -185,8 +186,8 @@ void UpdateSyncItemInLocalStorage(

base::DictionaryValue* dict_item = nullptr;

if (!pref_update->GetDictionaryWithoutPathExpansion(sync_item->item_id,

&dict_item)) {

- dict_item = new base::DictionaryValue();

- pref_update->SetWithoutPathExpansion(sync_item->item_id, dict_item);

+ dict_item = pref_update->SetDictionaryWithoutPathExpansion(

+ sync_item->item_id, base::MakeUnique<base::DictionaryValue>());

}

dict_item->SetString(kNameKey, sync_item->item_name);