[Merge-M53] arc: Add support of default and OEM apps.

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 <utility>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 23 matching lines @@
 #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/arc/arc_auth_service.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"
 #endif
 
 using syncer::SyncChange;
 
 namespace app_list {
 
 namespace {
 
 const char kOemFolderId[] = "ddb1da55-d478-4243-8642-56d3041f0263";
@@ skipping 997 matching lines @@
     oem_ordinal = prev->position().CreateBetween(next->position());
   } else {
     oem_ordinal = prev->position().CreateAfter();
   }
   VLOG(1) << "Placing OEM Folder at: " << oem_index
           << " position: " << oem_ordinal.ToDebugString();
   return oem_ordinal;
 }
 
 bool AppListSyncableService::AppIsOem(const std::string& id) {
+#if defined(OS_CHROMEOS)
+  const ArcAppListPrefs* arc_prefs = ArcAppListPrefs::Get(profile_);
+  if (arc_prefs && arc_prefs->IsOem(id))
+    return true;
+#endif
+
   if (!extension_system_->extension_service())
     return false;
   const extensions::Extension* extension =
       extension_system_->extension_service()->GetExtensionById(id, true);
   return extension && extension->was_installed_by_oem();
 }
 
 std::string AppListSyncableService::SyncItem::ToString() const {
   std::string res = item_id.substr(0, 8);
   if (item_type == sync_pb::AppListSpecifics::TYPE_REMOVE_DEFAULT_APP) {
     res += " { RemoveDefault }";
   } else {
     res += " { " + item_name + " }";
     res += " [" + item_ordinal.ToDebugString() + "]";
     if (!parent_id.empty())
       res += " <" + parent_id.substr(0, 8) + ">";
     res += " [" + item_pin_ordinal.ToDebugString() + "]";
   }
   return res;
 }
 
 }  // namespace app_list