Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure ContentSettingsStore::RegisterExtension is called for components #48

Merged
merged 1 commit into from
Feb 28, 2018
Merged

Ensure ContentSettingsStore::RegisterExtension is called for components #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion patches/chrome-browser-extensions-extension_service.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index ca649731ea800e0c7bd3e4c39ff6232f41af85db..b0b7bdec4fffebccd9e136ff51cffbb66e5b7359 100644
index ca649731ea800e0c7bd3e4c39ff6232f41af85db..e390f76c5fbc62c79568cabc0373e68bbfaa42b7 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -27,6 +27,7 @@
Expand All @@ -19,3 +19,23 @@ index ca649731ea800e0c7bd3e4c39ff6232f41af85db..b0b7bdec4fffebccd9e136ff51cffbb6
profile->GetPrefs(),
g_browser_process->local_state(),
profile));
@@ -1417,6 +1418,19 @@ void ExtensionService::AddComponentExtension(const Extension* extension) {
}

AddExtension(extension);
+#if defined(CHROMIUM_BUILD)
+ // ContentSettingsStore::RegisterExtension is only called for default components
+ // on the first run with a fresh profile. All restarts of the browser after that do not call it.
+ // This causes ContentSettingsStore's `entries_` to never insert the component ID
+ // and then ContentSettingsStore::GetValueMap always returns nullptr.
+ // I don't think Chromium is affeced by this simply because they don't use content settings
+ // from default component extensions.
+ extension_prefs_->OnExtensionInstalled(extension, Extension::ENABLED,
+ syncer::StringOrdinal(),
+ extensions::kInstallFlagNone,
+ std::string(),
+ base::nullopt);
+#endif
}

void ExtensionService::CheckPermissionsIncrease(const Extension* extension,