summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/external_component_loader.cc
diff options
context:
space:
mode:
authoryefim@chromium.org <yefim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-12 21:16:40 +0000
committeryefim@chromium.org <yefim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-12 21:16:40 +0000
commitf93a6c6b376fe2ce3bb26698b6c4cb4cd0e36c28 (patch)
treed8ca4060b70c2d4fb5b7240e8c3f2daaef6938c6 /chrome/browser/extensions/external_component_loader.cc
parent602f2dd4ad787a55009f32dd773d2b0d2b139a11 (diff)
downloadchromium_src-f93a6c6b376fe2ce3bb26698b6c4cb4cd0e36c28.zip
chromium_src-f93a6c6b376fe2ce3bb26698b6c4cb4cd0e36c28.tar.gz
chromium_src-f93a6c6b376fe2ce3bb26698b6c4cb4cd0e36c28.tar.bz2
Enhanced bookmarks: added support for sync based experiment
BUG=321393 Review URL: https://codereview.chromium.org/156103002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/external_component_loader.cc')
-rw-r--r--chrome/browser/extensions/external_component_loader.cc12
1 files changed, 11 insertions, 1 deletions
diff --git a/chrome/browser/extensions/external_component_loader.cc b/chrome/browser/extensions/external_component_loader.cc
index 579a38b..50b0a3d 100644
--- a/chrome/browser/extensions/external_component_loader.cc
+++ b/chrome/browser/extensions/external_component_loader.cc
@@ -40,11 +40,21 @@ void ExternalComponentLoader::StartLoading() {
if (CommandLine::ForCurrentProcess()->
GetSwitchValueASCII(switches::kEnableEnhancedBookmarks) != "0") {
- std::string ext_id = GetEnhancedBookmarksExtensionId();
+ std::string ext_id;
+ if (profile_->GetPrefs()->GetBoolean(
+ prefs::kEnhancedBookmarksExperimentEnabled)) {
+ ext_id =
+ profile_->GetPrefs()->GetString(prefs::kEnhancedBookmarksExtensionId);
+ } else {
+ ext_id = GetEnhancedBookmarksExtensionIdFromFinch();
+ }
if (!ext_id.empty()) {
prefs_->SetString(ext_id + ".external_update_url",
extension_urls::GetWebstoreUpdateUrl().spec());
}
+ } else {
+ profile_->GetPrefs()->ClearPref(prefs::kEnhancedBookmarksExperimentEnabled);
+ profile_->GetPrefs()->ClearPref(prefs::kEnhancedBookmarksExtensionId);
}
LoadFinished();
}