arc: Handle position conflict in app list items.

chrome/browser/ui/app_list/app_list_syncable_service.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_SYNCABLE_SERVICE_H_
 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_SYNCABLE_SERVICE_H_
 
 #include <stddef.h>
 
 #include <map>
@@ skipping 67 matching lines @@
   };
 
   using SyncItemMap = std::map<std::string, std::unique_ptr<SyncItem>>;
 
   // Populates the model when |extension_system| is ready.
   AppListSyncableService(Profile* profile,
                          extensions::ExtensionSystem* extension_system);
 
   ~AppListSyncableService() override;
 
+  static const char kOemFolderId[];
+
   // Registers prefs to support local storage.
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
   // Adds |item| to |sync_items_| and |model_|. If a sync item already exists,
   // updates the existing sync item instead.
   void AddItem(std::unique_ptr<AppListItem> app_item);
 
   // Removes sync item matching |id|.
   void RemoveItem(const std::string& id);
 
@@ skipping 178 matching lines @@
   std::unique_ptr<DriveAppProvider> drive_app_provider_;
 
   base::WeakPtrFactory<AppListSyncableService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListSyncableService);
 };
 
 }  // namespace app_list
 
 #endif  // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SYNCABLE_SERVICE_H_