arc-app-launcher: Minimal support for ARC app launcher.

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 "base/strings/string_util.h"
 #include "chrome/browser/apps/drive/drive_app_provider.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_prefs.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
+#include "chrome/browser/ui/app_list/arc_app_item.h"
+#include "chrome/browser/ui/app_list/arc_app_model_builder.h"
 #include "chrome/browser/ui/app_list/extension_app_item.h"
 #include "chrome/browser/ui/app_list/extension_app_model_builder.h"
 #include "chrome/browser/ui/app_list/model_pref_updater.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/uninstall_reason.h"
@@ skipping 101 matching lines @@
     ExtensionService::UninstallExtensionHelper(
         service, id, extensions::UNINSTALL_REASON_SYNC);
   }
 }
 
 bool GetAppListItemType(AppListItem* item,
                         sync_pb::AppListSpecifics::AppListItemType* type) {
   const char* item_type = item->GetItemType();
   if (item_type == ExtensionAppItem::kItemType) {
     *type = sync_pb::AppListSpecifics::TYPE_APP;
+  } else if (item_type == ArcAppItem::kItemType) {
+      *type = sync_pb::AppListSpecifics::TYPE_APP;

[elijahtaylor1, 2015/10/28 06:32:38]

nit: alignment

[khmel1, 2015/10/29 08:12:18]

Done.

   } else if (item_type == AppListFolderItem::kItemType) {
     *type = sync_pb::AppListSpecifics::TYPE_FOLDER;
   } else {
     LOG(ERROR) << "Unrecognized model type: " << item_type;
     return false;
   }
   return true;
 }
 
 bool IsDriveAppSyncId(const std::string& sync_id) {
@@ skipping 113 matching lines @@
   // For now, use the AppListControllerDelegate associated with the native
   // desktop. TODO(stevenjb): Remove ExtensionAppModelBuilder controller
   // dependency and move the dependent methods from AppListControllerDelegate
   // to an extension service delegate associated with this class.
   AppListControllerDelegate* controller = NULL;
   AppListService* service =
       AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE);
   if (service)
     controller = service->GetControllerDelegate();
   apps_builder_.reset(new ExtensionAppModelBuilder(controller));
+  arc_apps_builder_.reset(new ArcAppModelBuilder(controller));
   DCHECK(profile_);
   if (app_list::switches::IsAppListSyncEnabled()) {
     VLOG(1) << this << ": AppListSyncableService: InitializeWithService.";
     SyncStarted();
     apps_builder_->InitializeWithService(this, model_.get());
+    arc_apps_builder_->InitializeWithService(this, model_.get());
   } else {
     VLOG(1) << this << ": AppListSyncableService: InitializeWithProfile.";
     apps_builder_->InitializeWithProfile(profile_, model_.get());
+    arc_apps_builder_->InitializeWithProfile(profile_, model_.get());
   }
 
   model_pref_updater_.reset(
       new ModelPrefUpdater(AppListPrefs::Get(profile_), model_.get()));
 
   if (app_list::switches::IsDriveAppsInAppListEnabled())
     drive_app_provider_.reset(new DriveAppProvider(profile_, this));
 }
 
 size_t AppListSyncableService::GetNumSyncItemsForTest() {
@@ skipping 709 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