Only count non-default apps against first time 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 13 matching lines @@
 #include "sync/api/sync_merge_result.h"
 #include "sync/protocol/sync.pb.h"
 #include "ui/app_list/app_list_folder_item.h"
 #include "ui/app_list/app_list_item.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_model_observer.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/file_manager/app_id.h"
 #include "chrome/browser/chromeos/genius_app/app_id.h"
 #endif
 
 using syncer::SyncChange;
 
 namespace app_list {
 
 namespace {
 
 const char kOemFolderId[] = "ddb1da55-d478-4243-8642-56d3041f0263";
@@ skipping 57 matching lines @@
 bool AppIsDefault(ExtensionService* service, const std::string& id) {
   return service && extensions::ExtensionPrefs::Get(service->profile())
                         ->WasInstalledByDefault(id);
 }
 
 bool IsUnRemovableDefaultApp(const std::string& id) {
   if (id == extension_misc::kChromeAppId ||
       id == extension_misc::kWebStoreAppId)
     return true;
 #if defined(OS_CHROMEOS)
-  if (id == genius_app::kGeniusAppId)
+  if (id == file_manager::kFileManagerAppId || id == genius_app::kGeniusAppId)
     return true;
 #endif
   return false;
 }
 
 void UninstallExtension(ExtensionService* service, const std::string& id) {
   if (service && service->GetInstalledExtension(id))
     service->UninstallExtension(id, false, NULL);
 }
 
@@ skipping 80 matching lines @@
 };
 
 // AppListSyncableService
 
 AppListSyncableService::AppListSyncableService(
     Profile* profile,
     extensions::ExtensionSystem* extension_system)
     : profile_(profile),
       extension_system_(extension_system),
       model_(new AppListModel),
-      first_app_list_sync_(false) {
+      first_app_list_sync_(true) {
   if (!extension_system) {
     LOG(ERROR) << "AppListSyncableService created with no ExtensionSystem";
     return;
   }
 
   oem_folder_name_ =
       l10n_util::GetStringUTF8(IDS_APP_LIST_OEM_DEFAULT_FOLDER_NAME);
 
   // Note: model_observer_ is constructed after the initial sync changes are
   // received in MergeDataAndStartSyncing(). Changes to the model before that
@@ skipping 307 matching lines @@
   VLOG(1) << this << ": MergeDataAndStartSyncing: "
           << initial_sync_data.size();
 
   // Copy all sync items to |unsynced_items|.
   std::set<std::string> unsynced_items;
   for (SyncItemMap::const_iterator iter = sync_items_.begin();
        iter != sync_items_.end(); ++iter) {
     unsynced_items.insert(iter->first);
   }
 
-  first_app_list_sync_ = initial_sync_data.empty();
-
   // Create SyncItem entries for initial_sync_data.
   size_t new_items = 0, updated_items = 0;
   for (syncer::SyncDataList::const_iterator iter = initial_sync_data.begin();
        iter != initial_sync_data.end(); ++iter) {
     const syncer::SyncData& data = *iter;
     const std::string& item_id = data.GetSpecifics().app_list().item_id();
+    const sync_pb::AppListSpecifics& specifics = data.GetSpecifics().app_list();
     DVLOG(2) << this << "  Initial Sync Item: " << item_id
-             << " Type: " << data.GetSpecifics().app_list().item_type();
+             << " Type: " << specifics.item_type();
     DCHECK_EQ(syncer::APP_LIST, data.GetDataType());
-    if (ProcessSyncItemSpecifics(data.GetSpecifics().app_list()))
+    if (ProcessSyncItemSpecifics(specifics))
       ++new_items;
     else
       ++updated_items;
+    if (specifics.item_type() != sync_pb::AppListSpecifics::TYPE_FOLDER &&
+        !IsUnRemovableDefaultApp(item_id) &&
+        !AppIsDefault(extension_system_->extension_service(), item_id)) {
+      VLOG(2) << "Syncing non-default item: " << item_id;
+      first_app_list_sync_ = false;
+    }
     unsynced_items.erase(item_id);
   }
 
   result.set_num_items_after_association(sync_items_.size());
   result.set_num_items_added(new_items);
   result.set_num_items_deleted(0);
   result.set_num_items_modified(updated_items);
 
   // Send unsynced items. Does not affect |result|.
   syncer::SyncChangeList change_list;
   for (std::set<std::string>::iterator iter = unsynced_items.begin();
        iter != unsynced_items.end(); ++iter) {
     SyncItem* sync_item = FindSyncItem(*iter);
+    // Sync can cause an item to change folders, causing an unsynced folder
+    // item to be removed.
+    if (!sync_item)
+      continue;
     VLOG(2) << this << " -> SYNC ADD: " << sync_item->ToString();
     change_list.push_back(SyncChange(FROM_HERE,  SyncChange::ACTION_ADD,
                                      GetSyncDataFromSyncItem(sync_item)));
   }
   sync_processor_->ProcessSyncChanges(FROM_HERE, change_list);
 
   // Adding items may have created folders without setting their positions
   // since we haven't started observing the item list yet. Resolve those.
   ResolveFolderPositions();
 
@@ skipping 265 matching lines @@
       DVLOG(1) << "Creating new OEM folder sync item: "
                << oem_folder->position().ToDebugString();
       CreateSyncItemFromAppItem(oem_folder);
     }
   }
   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.";
     syncer::StringOrdinal last;
     for (SyncItemMap::iterator iter = sync_items_.begin();
          iter != sync_items_.end(); ++iter) {
       SyncItem* sync_item = iter->second;
       if (!last.IsValid() || sync_item->item_ordinal.GreaterThan(last))
         last = sync_item->item_ordinal;
     }
     return last.CreateAfter();
@@ skipping 41 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