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

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: Added a preference for creation_flags, Also added creation_flags check in ReloadExtensions unittest Created 8 years, 3 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 8c98b77b833c4df46466231fe61dcde78502522b..322478760459409eb89a8aa64d26ef78cc4d35e7 100644
--- a/chrome/browser/extensions/installed_loader.cc
+++ b/chrome/browser/extensions/installed_loader.cc
@@ -303,15 +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;
return flags;
}

Powered by Google App Engine
This is Rietveld 408576698