Instead of marking all default apps as bookmark apps, allow it to be specified per-app.

chrome/browser/extensions/external_extension_provider_impl.cc

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 43d24fcacc4157400ad383ce4d5a78d5c6d150da..4963327015c990637e7f4959f932a0f4132ce665 100644
--- a/chrome/browser/extensions/external_extension_provider_impl.cc
+++ b/chrome/browser/extensions/external_extension_provider_impl.cc
@@ -49,6 +49,8 @@ const char ExternalExtensionProviderImpl::kExternalUpdateUrl[] =
     "external_update_url";
 const char ExternalExtensionProviderImpl::kSupportedLocales[] =
     "supported_locales";
+const char ExternalExtensionProviderImpl::kIsBookmarkApp[] =
+    "is_bookmark_app";
 
 ExternalExtensionProviderImpl::ExternalExtensionProviderImpl(
     VisitorInterface* service,
@@ -168,6 +170,13 @@ void ExternalExtensionProviderImpl::SetPrefs(DictionaryValue* prefs) {
       }
     }
 
+    int creation_flags = creation_flags_;
+    bool is_bookmark_app;
+    if (extension->GetBoolean(kIsBookmarkApp, &is_bookmark_app) &&
+        is_bookmark_app) {
+      creation_flags |= Extension::FROM_BOOKMARK;
+    }
+
     if (has_external_crx) {
       if (crx_location_ == Extension::INVALID) {
         LOG(WARNING) << "This provider does not support installing external "
@@ -203,7 +212,7 @@ void ExternalExtensionProviderImpl::SetPrefs(DictionaryValue* prefs) {
         continue;
       }
       service_->OnExternalExtensionFileFound(extension_id, version.get(), path,
-                                             crx_location_, creation_flags_,
+                                             crx_location_, creation_flags,
                                              auto_acknowledge_);
     } else { // if (has_external_update_url)
       CHECK(has_external_update_url);  // Checking of keys above ensures this.
@@ -243,10 +252,6 @@ bool ExternalExtensionProviderImpl::IsReady() const {
   return ready_;
 }
 
-int ExternalExtensionProviderImpl::GetCreationFlags() const {
-  return creation_flags_;
-}
-
 bool ExternalExtensionProviderImpl::HasExtension(
     const std::string& id) const {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -379,7 +384,7 @@ void ExternalExtensionProviderImpl::CreateExternalProviders(
                   ExternalPrefExtensionLoader::NONE),
               Extension::EXTERNAL_PREF,
               Extension::INVALID,
-              Extension::FROM_BOOKMARK)));
+              Extension::FROM_WEBSTORE)));
 #endif
 
 #if defined(OS_CHROMEOS)