Always create OEM folder, update position after sync

chrome/browser/ui/app_list/app_list_syncable_service.cc

 // 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.
 
 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/apps/drive/drive_app_provider.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 287 matching lines @@
 }
 
 void AppListSyncableService::AddItem(scoped_ptr<AppListItem> app_item) {
   SyncItem* sync_item = FindOrAddSyncItem(app_item.get());
   if (!sync_item)
     return;  // Item is not valid.
 
   std::string folder_id;
   if (app_list::switches::IsFolderUIEnabled()) {
     if (AppIsOem(app_item->id())) {
-      folder_id = FindOrCreateOemFolder(app_item->id());
+      folder_id = FindOrCreateOemFolder();
       VLOG_IF(2, !folder_id.empty())
           << this << ": AddItem to OEM folder: " << sync_item->ToString();
     } else {
       folder_id = sync_item->parent_id;
     }
   }
   VLOG(2) << this << ": AddItem: " << sync_item->ToString()
           << " Folder: '" << folder_id << "'";
   model_->AddItemToFolder(app_item.Pass(), folder_id);
 }
@@ skipping 150 matching lines @@
        iter != sync_items_.end(); ++iter) {
     SyncItem* sync_item = iter->second;
     if (sync_item->item_type != sync_pb::AppListSpecifics::TYPE_FOLDER)
       continue;
     AppListItem* app_item = model_->FindItem(sync_item->item_id);
     if (!app_item)
       continue;
     UpdateAppItemFromSyncItem(sync_item, app_item);
   }
 
-  // Create the OEM folder if necessary.
-  if (oem_folder_item_ids_.empty())
-    return;
-  std::string oem_folder_id = FindOrCreateOemFolder("");
-  DCHECK(!oem_folder_id.empty());
-  for (std::vector<std::string>::iterator iter = oem_folder_item_ids_.begin();
-       iter != oem_folder_item_ids_.end(); ++iter) {
-    AppListItem* app_item = model_->FindItem(*iter);
-    if (!app_item)
-      continue;
-    VLOG(2) << this << ": MoveItem to OEM folder: "
-            << app_item->ToDebugString();
-    model_->MoveItemToFolder(app_item, oem_folder_id);
+  // Move the OEM folder if one exists and we have not synced its position.
+  AppListFolderItem* oem_folder = model_->FindFolderItem(kOemFolderId);
+  if (oem_folder && !FindSyncItem(kOemFolderId)) {
+    model_->SetItemPosition(oem_folder, GetOemFolderPos());
+    DVLOG(1) << "Creating new OEM folder sync item: "
+             << oem_folder->position().ToDebugString();
+    CreateSyncItemFromAppItem(oem_folder);
   }
 }
 
 void AppListSyncableService::PruneEmptySyncFolders() {
   if (!app_list::switches::IsFolderUIEnabled())
     return;
 
   std::set<std::string> parent_ids;
   for (SyncItemMap::iterator iter = sync_items_.begin();
        iter != sync_items_.end(); ++iter) {
@@ skipping 320 matching lines @@
       iter->second->item_type;
   VLOG(2) << this << " <- SYNC DELETE: " << iter->second->ToString();
   delete iter->second;
   sync_items_.erase(iter);
   // Only delete apps from the model. Folders will be deleted when all
   // children have been deleted.
   if (item_type == sync_pb::AppListSpecifics::TYPE_APP)
     model_->DeleteItem(item_id);
 }
 
-std::string AppListSyncableService::FindOrCreateOemFolder(
-    const std::string& item_id) {
+std::string AppListSyncableService::FindOrCreateOemFolder() {
   AppListFolderItem* oem_folder = model_->FindFolderItem(kOemFolderId);
   if (!oem_folder) {
-    if (!SyncStarted()) {
-      // We need sync to have started to know where to place the OEM folder.
-      // If sync is not started, add |item_id| (which should never be empty
-      // when called before sync is started) to oem_folder_item_ids_.
-      DCHECK(!item_id.empty());
-      oem_folder_item_ids_.push_back(item_id);
-      return "";
-    }
     scoped_ptr<AppListFolderItem> new_folder(new AppListFolderItem(
         kOemFolderId, AppListFolderItem::FOLDER_TYPE_OEM));
     oem_folder = static_cast<AppListFolderItem*>(
         model_->AddItem(new_folder.PassAs<app_list::AppListItem>()));
     SyncItem* oem_sync_item = FindSyncItem(kOemFolderId);
     if (oem_sync_item) {
       DVLOG(1) << "Creating OEM folder from existing sync item: "
                << oem_sync_item->item_ordinal.ToDebugString();
       model_->SetItemPosition(oem_folder, oem_sync_item->item_ordinal);
     } else {
       model_->SetItemPosition(oem_folder, GetOemFolderPos());
-      DVLOG(1) << "Creating new OEM folder sync item: "
-               << oem_folder->position().ToDebugString();
-      CreateSyncItemFromAppItem(oem_folder);
+      // Do not create a sync item for the OEM folder here, do it in
+      // ResolveFolderPositions() when the item position is finalized.
     }
   }
   model_->SetItemName(oem_folder, oem_folder_name_);
   return oem_folder->id();
 }
 
 syncer::StringOrdinal AppListSyncableService::GetOemFolderPos() {
   VLOG(1) << "GetOemFolderPos: " << first_app_list_sync_;
   if (!first_app_list_sync_) {
     DVLOG(1) << "Sync items exist, placing OEM folder at end.";
@@ skipping 49 matching lines @@
   } else {
     res += " { " + item_name + " }";
     res += " [" + item_ordinal.ToDebugString() + "]";
     if (!parent_id.empty())
       res += " <" + parent_id.substr(0, 8) + ">";
   }
   return res;
 }
 
 }  // namespace app_list