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

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 2678083005: Remove extension-to-component migration mechanism (Closed)
Patch Set: Address Devlin's comments Created 3 years, 10 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
« no previous file with comments | « chrome/browser/extensions/component_migration_helper_unittest.cc ('k') | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index f28f1ce5b8218fb6fc41ecfb58a6f0a71afb46f8..c212a3fd4952a1472ae5a939747f028cbf11b41b 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -128,7 +128,6 @@
#include "chrome/browser/extensions/activity_log/activity_log.h"
#include "chrome/browser/extensions/api/commands/command_service.h"
#include "chrome/browser/extensions/api/tabs/tabs_api.h"
-#include "chrome/browser/extensions/component_migration_helper.h"
#include "chrome/browser/extensions/extension_web_ui.h"
#include "chrome/browser/extensions/launch_util.h"
#include "chrome/browser/signin/easy_unlock_service.h"
@@ -532,7 +531,6 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
RegisterAnimationPolicyPrefs(registry);
ToolbarActionsBar::RegisterProfilePrefs(registry);
extensions::ActivityLog::RegisterProfilePrefs(registry);
- extensions::ComponentMigrationHelper::RegisterPrefs(registry);
extensions::ExtensionPrefs::RegisterProfilePrefs(registry);
extensions::launch_util::RegisterProfilePrefs(registry);
extensions::RuntimeAPI::RegisterPrefs(registry);
@@ -796,6 +794,11 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
// Added 9/2016.
profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
+
+#if BUILDFLAG(ENABLE_EXTENSIONS)
+ // Added 2/2017.
+ profile_prefs->ClearPref(prefs::kToolbarMigratedComponentActionStatus);
+#endif
}
} // namespace chrome
« no previous file with comments | « chrome/browser/extensions/component_migration_helper_unittest.cc ('k') | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698