| 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 336519b4ad635806f20b65056d0011b1ced0a031..4035cb2d139c3a969636e98ce2272a79fa602b59 100644
|
| --- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
|
| +++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
|
| @@ -3,6 +3,7 @@
|
| // found in the LICENSE file.
|
|
|
| #include "base/command_line.h"
|
| +#include "build/build_config.h"
|
| #include "chrome/browser/extensions/app_notification_manager.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/extensions/settings/settings_backend.h"
|
| @@ -268,10 +269,17 @@ ProfileSyncComponentsFactory::SyncComponents
|
| BookmarkModel* bookmark_model =
|
| profile_sync_service->profile()->GetBookmarkModel();
|
| sync_api::UserShare* user_share = profile_sync_service->GetUserShare();
|
| + // TODO(akalin): We may want to propagate this switch up eventually.
|
| +#if defined(OS_ANDROID)
|
| + const bool kCreateMobileBookmarksFolder = true;
|
| +#else
|
| + const bool kCreateMobileBookmarksFolder = false;
|
| +#endif
|
| BookmarkModelAssociator* model_associator =
|
| new BookmarkModelAssociator(bookmark_model,
|
| user_share,
|
| - error_handler);
|
| + error_handler,
|
| + kCreateMobileBookmarksFolder);
|
| BookmarkChangeProcessor* change_processor =
|
| new BookmarkChangeProcessor(model_associator,
|
| error_handler);
|
|
|