app_list: Drive app integration.

chrome/common/extensions/sync_helper.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/common/extensions/sync_helper.h"
 
 #include "base/logging.h"
 #include "chrome/common/extensions/api/plugins/plugins_handler.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
@@ skipping 67 matching lines @@
 }  // namespace
 
 bool IsSyncable(const Extension* extension) {
   // TODO(akalin): Figure out if we need to allow some other types.
 
   // Default apps are not synced because otherwise they will pollute profiles
   // that don't already have them. Specially, if a user doesn't have default
   // apps, creates a new profile (which get default apps) and then enables sync
   // for it, then their profile everywhere gets the default apps.
   bool is_syncable = (extension->location() == Manifest::INTERNAL &&
-                      !extension->was_installed_by_default());
+                      !extension->was_installed_by_default() &&
+                      extension->is_syncable());
   // Sync the chrome web store to maintain its position on the new tab page.
   is_syncable |= (extension->id() == extension_misc::kWebStoreAppId);
   // Sync the chrome component app to maintain its position on the app list.
   is_syncable |= (extension->id() == extension_misc::kChromeAppId);
   return is_syncable;
 }
 
 bool IsSyncableExtension(const Extension* extension) {
   return GetSyncType(extension) == SYNC_TYPE_EXTENSION;
 }
 
 bool IsSyncableApp(const Extension* extension) {
   return GetSyncType(extension) == SYNC_TYPE_APP;
 }
 
 }  // namespace sync_helper
 }  // namespace extensions