diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 18:23:05 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 18:23:05 +0000 |
| commit | e805baf32a66a7e73a9d3cb1512683c29af244b4 (patch) | |
| tree | bc75cbc1b998b56545e32c44a4b118db8b6a7e50 /chrome/browser/extensions/extension_service.cc | |
| parent | 3243501e8b51236df8e9b010c84d7a093eabe7ad (diff) | |
| download | chromium_src-e805baf32a66a7e73a9d3cb1512683c29af244b4.zip chromium_src-e805baf32a66a7e73a9d3cb1512683c29af244b4.tar.gz chromium_src-e805baf32a66a7e73a9d3cb1512683c29af244b4.tar.bz2 | |
Add ability to create extension/app for a bookmark-app drop.
R=estade@chromium.org
BUG=none
TEST=WebAppInfo.Bookmark,ExtensionTest.ExtraFlags,ExtensionPrefsFlags
Review URL: http://codereview.chromium.org/7410004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_service.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_service.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index d1bb123..5ff972e 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -1134,6 +1134,8 @@ void ExtensionService::LoadAllExtensions() { flags |= Extension::ALLOW_FILE_ACCESS; if (extension_prefs_->IsFromWebStore(info->extension_id)) flags |= Extension::FROM_WEBSTORE; + if (extension_prefs_->IsFromBookmark(info->extension_id)) + flags |= Extension::FROM_BOOKMARK; std::string error; scoped_refptr<const Extension> extension( extension_file_util::LoadExtension( @@ -1305,6 +1307,8 @@ void ExtensionService::LoadInstalledExtension(const ExtensionInfo& info, flags |= Extension::ALLOW_FILE_ACCESS; if (extension_prefs_->IsFromWebStore(info.extension_id)) flags |= Extension::FROM_WEBSTORE; + if (extension_prefs_->IsFromBookmark(info.extension_id)) + flags |= Extension::FROM_BOOKMARK; extension = Extension::Create( info.extension_path, info.extension_location, |