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

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

Issue 9453036: [Sync] Remove --create-mobile-bookmarks-folder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove comment Created 8 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
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);

Powered by Google App Engine
This is Rietveld 408576698