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

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

Issue 10977048: Fix bug in disabling sync for default apps (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fix browser and integration tests, which got broken Created 8 years, 2 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
Index: chrome/browser/extensions/installed_loader.cc
diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc
index 1041ee53f02a20595a746e15e69e7794cb89c5d3..322478760459409eb89a8aa64d26ef78cc4d35e7 100644
--- a/chrome/browser/extensions/installed_loader.cc
+++ b/chrome/browser/extensions/installed_loader.cc
@@ -303,18 +303,11 @@ void InstalledLoader::LoadAllExtensions() {
}
int InstalledLoader::GetCreationFlags(const ExtensionInfo* info) {
- int flags = Extension::NO_FLAGS;
+ int flags = extension_prefs_->GetCreationFlags(info->extension_id);
if (info->extension_location != Extension::LOAD)
flags |= Extension::REQUIRE_KEY;
if (extension_prefs_->AllowFileAccess(info->extension_id))
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;
- if (extension_prefs_->WasInstalledByDefault(info->extension_id)) {
- flags |= Extension::WAS_INSTALLED_BY_DEFAULT;
- }
return flags;
}
« no previous file with comments | « chrome/browser/extensions/extension_sorting_unittest.cc ('k') | chrome/browser/extensions/test_extension_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698