diff options
| author | sdefresne <sdefresne@chromium.org> | 2015-07-27 12:18:00 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-27 19:18:57 +0000 |
| commit | 0f2ef35a2de53103f42a7ab62ccc07aa34481e41 (patch) | |
| tree | 7e6b89bd5a67371f5ba652948ce7886782970412 /chrome/browser/sync/profile_sync_components_factory_impl.cc | |
| parent | f7701e71c321e821163217db2336241d240c563b (diff) | |
| download | chromium_src-0f2ef35a2de53103f42a7ab62ccc07aa34481e41.zip chromium_src-0f2ef35a2de53103f42a7ab62ccc07aa34481e41.tar.gz chromium_src-0f2ef35a2de53103f42a7ab62ccc07aa34481e41.tar.bz2 | |
Componentize enhanced_bookmark_features.{h,cc}.
Enhanced bookmarks and the DOM distiller are (or will be) used on
iOS and android. Move the function checking whether the features
are enabled into the respective component to allow sharing the code.
Move IsEnhancedBookmarksEnabled() function to the enhanced_bookmarks
component with supporting switches.
Move IsEnableDomDistillerSet() and IsEnableSyncArticlesSet() functions
to the dom_distiller component with supporting switches.
BUG=359565
Review URL: https://codereview.chromium.org/1253953002
Cr-Commit-Position: refs/heads/master@{#340526}
Diffstat (limited to 'chrome/browser/sync/profile_sync_components_factory_impl.cc')
| -rw-r--r-- | chrome/browser/sync/profile_sync_components_factory_impl.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc index 04d821c..e4b1cbd 100644 --- a/chrome/browser/sync/profile_sync_components_factory_impl.cc +++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc @@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/sync/profile_sync_components_factory_impl.h" + #include "base/command_line.h" #include "build/build_config.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" -#include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/password_manager/password_store_factory.h" @@ -32,7 +33,6 @@ #include "chrome/browser/sync/glue/typed_url_change_processor.h" #include "chrome/browser/sync/glue/typed_url_data_type_controller.h" #include "chrome/browser/sync/glue/typed_url_model_associator.h" -#include "chrome/browser/sync/profile_sync_components_factory_impl.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/browser/sync/sessions/session_data_type_controller.h" @@ -50,6 +50,7 @@ #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" #include "components/autofill/core/common/autofill_pref_names.h" #include "components/autofill/core/common/autofill_switches.h" +#include "components/dom_distiller/core/dom_distiller_features.h" #include "components/dom_distiller/core/dom_distiller_service.h" #include "components/history/core/browser/history_service.h" #include "components/password_manager/core/browser/password_store.h" @@ -325,7 +326,7 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes( } // Article sync is disabled by default. Register only if explicitly enabled. - if (IsEnableSyncArticlesSet()) { + if (dom_distiller::IsEnableSyncArticlesSet()) { pss->RegisterDataTypeController( new UIDataTypeController( BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), |