Supervised Users Initiated Installs v2

chrome/browser/extensions/extension_sync_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/extensions/extension_sync_service.h"
 
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 87 matching lines @@
 
 syncer::SyncDataList ToSyncerSyncDataList(
     const std::vector<ExtensionSyncData>& data) {
   syncer::SyncDataList result;
   result.reserve(data.size());
   for (const ExtensionSyncData& item : data)
     result.push_back(item.GetSyncData());
   return result;
 }
 
-static_assert(Extension::DISABLE_REASON_LAST == (1 << 15),
+static_assert(Extension::DISABLE_REASON_LAST == (1 << 16),
               "Please consider whether your new disable reason should be"
               " syncable, and if so update this bitmask accordingly!");
 const int kKnownSyncableDisableReasons =
     Extension::DISABLE_USER_ACTION |
     Extension::DISABLE_PERMISSIONS_INCREASE |
     Extension::DISABLE_SIDELOAD_WIPEOUT |
     Extension::DISABLE_GREYLIST |
     Extension::DISABLE_REMOTE_INSTALL;
 const int kAllKnownDisableReasons = Extension::DISABLE_REASON_LAST - 1;
 // We also include any future bits for newer clients that added another disable
@@ skipping 156 matching lines @@
   enabled = enabled &&
       extension_prefs->GetExtensionBlacklistState(extension.id()) ==
           extensions::NOT_BLACKLISTED;
   bool incognito_enabled = extensions::util::IsIncognitoEnabled(id, profile_);
   bool remote_install =
       extension_prefs->HasDisableReason(id, Extension::DISABLE_REMOTE_INSTALL);
   ExtensionSyncData::OptionalBoolean allowed_on_all_url =
       GetAllowedOnAllUrlsOptionalBoolean(id, profile_);
   AppSorting* app_sorting = ExtensionSystem::Get(profile_)->app_sorting();
 
-  ExtensionSyncData result = extension.is_app()
-      ? ExtensionSyncData(
-            extension, enabled, disable_reasons, incognito_enabled,
-            remote_install, allowed_on_all_url,
-            app_sorting->GetAppLaunchOrdinal(id),
-            app_sorting->GetPageOrdinal(id),
-            extensions::GetLaunchTypePrefValue(extension_prefs, id))
-      : ExtensionSyncData(
-            extension, enabled, disable_reasons, incognito_enabled,
-            remote_install, allowed_on_all_url);
+  ExtensionSyncData result =
+      extension.is_app()

[Marc Treib, 2016/05/23 15:32:42]

Also here: Please avoid unrelated formatting changes.

[mamir, 2016/05/23 19:35:14]

I got confused while moving between different branches and comitted some
formatting changes by mistake, sorry!

+          ? ExtensionSyncData(
+                extension, enabled, disable_reasons, incognito_enabled,
+                remote_install, allowed_on_all_url,
+                app_sorting->GetAppLaunchOrdinal(id),
+                app_sorting->GetPageOrdinal(id),
+                extensions::GetLaunchTypePrefValue(extension_prefs, id))
+          : ExtensionSyncData(extension, enabled, disable_reasons,
+                              incognito_enabled, remote_install,
+                              allowed_on_all_url);
 
   // If there's a pending update, send the new version to sync instead of the
   // installed one.
   auto it = pending_updates_.find(id);
   if (it != pending_updates_.end()) {
     const base::Version& version = it->second.version;
     // If we have a pending version, it should be newer than the installed one.
     DCHECK_EQ(-1, extension.version()->CompareTo(version));
     result.set_version(version);
     // If we'll re-enable the extension once it's updated, also send that back
@@ skipping 398 matching lines @@
       sync_data_list->push_back(CreateSyncData(*extension));
     }
   }
 }
 
 bool ExtensionSyncService::ShouldSync(const Extension& extension) const {
   // Themes are handled by the ThemeSyncableService.
   return extensions::util::ShouldSync(&extension, profile_) &&
          !extension.is_theme();
 }