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

Unified Diff: chrome/browser/sync/engine/syncer.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/engine/syncer.cc
diff --git a/chrome/browser/sync/engine/syncer.cc b/chrome/browser/sync/engine/syncer.cc
index f64b030767d740777a4dc2c65eedeb92fce8404c..80c0d08b2d6ea4309406de82147c410fb1a4e473 100644
--- a/chrome/browser/sync/engine/syncer.cc
+++ b/chrome/browser/sync/engine/syncer.cc
@@ -9,6 +9,7 @@
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/time.h"
+#include "build/build_config.h"
#include "chrome/browser/sync/engine/apply_updates_command.h"
#include "chrome/browser/sync/engine/build_commit_command.h"
#include "chrome/browser/sync/engine/cleanup_disabled_types_command.h"
@@ -141,7 +142,14 @@ void Syncer::SyncShare(sessions::SyncSession* session,
break;
}
case DOWNLOAD_UPDATES: {
- DownloadUpdatesCommand download_updates;
+ // TODO(akalin): We may want to propagate this switch up
+ // eventually.
+#if defined(OS_ANDROID)
+ const bool kIncludeSyncableBookmarks = true;
+#else
+ const bool kIncludeSyncableBookmarks = false;
+#endif
+ DownloadUpdatesCommand download_updates(kIncludeSyncableBookmarks);
session->mutable_status_controller()->set_last_download_updates_result(
download_updates.Execute(session));
next_step = PROCESS_CLIENT_COMMAND;

Powered by Google App Engine
This is Rietveld 408576698