X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fextensions%2Fpending_extension_manager.cc;h=ee8e2511ffda696231df1d95e6cd2369658b5274;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=199cb97f118f20644cbfab893570549d2956d060;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/chrome/browser/extensions/pending_extension_manager.cc b/src/chrome/browser/extensions/pending_extension_manager.cc index 199cb97..ee8e251 100644 --- a/src/chrome/browser/extensions/pending_extension_manager.cc +++ b/src/chrome/browser/extensions/pending_extension_manager.cc @@ -90,7 +90,8 @@ bool PendingExtensionManager::AddFromSync( const GURL& update_url, PendingExtensionInfo::ShouldAllowInstallPredicate should_allow_install, bool install_silently, - bool remote_install) { + bool remote_install, + bool installed_by_custodian) { CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); if (ExtensionRegistry::Get(context_)->GetExtensionById( @@ -108,6 +109,11 @@ bool PendingExtensionManager::AddFromSync( return false; } + int creation_flags = Extension::NO_FLAGS; + if (installed_by_custodian) { + creation_flags |= Extension::WAS_INSTALLED_BY_CUSTODIAN; + } + static const bool kIsFromSync = true; static const Manifest::Location kSyncLocation = Manifest::INTERNAL; static const bool kMarkAcknowledged = false; @@ -120,7 +126,7 @@ bool PendingExtensionManager::AddFromSync( kIsFromSync, install_silently, kSyncLocation, - Extension::NO_FLAGS, + creation_flags, kMarkAcknowledged, remote_install); }