chrome/browser/sync/profile_sync_components_factory_impl.cc - Issue 991353003: Cleanup: Put more Themes code behind defined(ENABLE_THEMES).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/profile_sync_components_factory_impl.cc

Issue 991353003: Cleanup: Put more Themes code behind defined(ENABLE_THEMES). Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 9 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

« chrome/browser/search/instant_service.cc ('K') | « chrome/browser/search_engines/ui_thread_search_terms_data.cc ('k') | chrome/browser/themes/theme_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_components_factory_impl.cc

diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc

index c71e48549377517dcd3384e54bf90d348db93b6d..cc033c9b1026fb3011edcb288dacaf944d464fab 100644

--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc

+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc

@@ -29,7 +29,6 @@

#include "chrome/browser/sync/glue/search_engine_data_type_controller.h"

#include "chrome/browser/sync/glue/sync_backend_host.h"

#include "chrome/browser/sync/glue/sync_backend_host_impl.h"

-#include "chrome/browser/sync/glue/theme_data_type_controller.h"

#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"

@@ -37,9 +36,6 @@

#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"

-#include "chrome/browser/themes/theme_service.h"

-#include "chrome/browser/themes/theme_service_factory.h"

-#include "chrome/browser/themes/theme_syncable_service.h"

#include "chrome/browser/webdata/web_data_service_factory.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/chrome_version_info.h"

@@ -102,6 +98,13 @@

#include "chrome/browser/spellchecker/spellcheck_service.h"

#endif

+#if defined(ENABLE_THEMES)

+#include "chrome/browser/sync/glue/theme_data_type_controller.h"

+#include "chrome/browser/themes/theme_service.h"

+#include "chrome/browser/themes/theme_service_factory.h"

+#include "chrome/browser/themes/theme_syncable_service.h"

+#endif

#if defined(OS_CHROMEOS)

#include "components/wifi_sync/wifi_credential_syncable_service.h"

#include "components/wifi_sync/wifi_credential_syncable_service_factory.h"

@@ -124,7 +127,9 @@ using browser_sync::PasswordDataTypeController;

using browser_sync::SearchEngineDataTypeController;

using browser_sync::SessionDataTypeController;

using browser_sync::SyncBackendHost;

+#if defined(ENABLE_THEMES)

using browser_sync::ThemeDataTypeController;

+#endif

using browser_sync::TypedUrlChangeProcessor;

using browser_sync::TypedUrlDataTypeController;

using browser_sync::TypedUrlModelAssociator;