Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6084)

Unified Diff: chrome/browser/extensions/external_extension_provider_impl.cc

Issue 10269031: Mark default apps on ChromeOS installed from DIR_EXTERNAL_EXTENSIONS "from webstore" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/external_extension_provider_impl.cc
diff --git a/chrome/browser/extensions/external_extension_provider_impl.cc b/chrome/browser/extensions/external_extension_provider_impl.cc
index d9f332ea7faadfd71c9dbaf35a418545c9472e65..0cf6ea929b746bbd602aaa0798a7e13e348c5ba3 100644
--- a/chrome/browser/extensions/external_extension_provider_impl.cc
+++ b/chrome/browser/extensions/external_extension_provider_impl.cc
@@ -315,25 +315,15 @@ void ExternalExtensionProviderImpl::CreateExternalProviders(
check_admin_permissions_on_mac),
Extension::EXTERNAL_PREF,
Extension::EXTERNAL_PREF_DOWNLOAD,
- Extension::NO_FLAGS)));
-
#if defined(OS_CHROMEOS)
- // Define a per-user source of external default extensions, which serves
- // as a source for OEM customization. Mark these default extensions as
- // being from the webstore so they can load Native Client modules.
- provider_list->push_back(
- linked_ptr<ExternalExtensionProviderInterface>(
- new ExternalExtensionProviderImpl(
- service,
- new ExternalPrefExtensionLoader(
- chrome::DIR_USER_EXTERNAL_EXTENSIONS,
- ExternalPrefExtensionLoader::NONE),
- Extension::EXTERNAL_PREF,
- Extension::EXTERNAL_PREF_DOWNLOAD,
Extension::FROM_WEBSTORE)));
+#else
+ Extension::NO_FLAGS)));
#endif
-#if defined (OS_MACOSX)
+
+#if defined(OS_CHROMEOS) || defined (OS_MACOSX)
// Define a per-user source of external extensions.
+ // On Chrome OS, this serves as a source for OEM customization.
provider_list->push_back(
linked_ptr<ExternalExtensionProviderInterface>(
new ExternalExtensionProviderImpl(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698