Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4382)

Unified Diff: chrome/browser/ui/app_list/app_list_syncable_service.cc

Issue 2230203002: chrome: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed accidental components/ change Created 4 years, 4 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
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 b4d070a24dff13c461c60625c64a710268a04d96..97db26e0bff4e6158be83de2c0e6fe3c12ebb34f 100644
--- a/chrome/browser/ui/app_list/app_list_syncable_service.cc
+++ b/chrome/browser/ui/app_list/app_list_syncable_service.cc
@@ -263,7 +263,8 @@ AppListSyncableService::~AppListSyncableService() {
model_observer_.reset();
model_pref_updater_.reset();
- STLDeleteContainerPairSecondPointers(sync_items_.begin(), sync_items_.end());
+ base::STLDeleteContainerPairSecondPointers(sync_items_.begin(),
+ sync_items_.end());
}
void AppListSyncableService::BuildModel() {
@@ -622,7 +623,7 @@ void AppListSyncableService::PruneEmptySyncFolders() {
SyncItem* sync_item = (iter++)->second;
if (sync_item->item_type != sync_pb::AppListSpecifics::TYPE_FOLDER)
continue;
- if (!ContainsKey(parent_ids, sync_item->item_id))
+ if (!base::ContainsKey(parent_ids, sync_item->item_id))
DeleteSyncItem(sync_item);
}
}
@@ -945,7 +946,7 @@ AppListSyncableService::SyncItem*
AppListSyncableService::CreateSyncItem(
const std::string& item_id,
sync_pb::AppListSpecifics::AppListItemType item_type) {
- DCHECK(!ContainsKey(sync_items_, item_id));
+ DCHECK(!base::ContainsKey(sync_items_, item_id));
SyncItem* sync_item = new SyncItem(item_id, item_type);
sync_items_[item_id] = sync_item;
return sync_item;

Powered by Google App Engine
This is Rietveld 408576698