Chromium Code Reviews| Index: chrome/browser/sync/engine/download_updates_command.cc |
| diff --git a/chrome/browser/sync/engine/download_updates_command.cc b/chrome/browser/sync/engine/download_updates_command.cc |
| index 102799703c69ef6669ba3b81ad9689293a3de3a3..17773605cd0d2603911b2ff7e3ebe9f5f008f182 100644 |
| --- a/chrome/browser/sync/engine/download_updates_command.cc |
| +++ b/chrome/browser/sync/engine/download_updates_command.cc |
| @@ -12,7 +12,6 @@ |
| #include "chrome/browser/sync/engine/syncproto.h" |
| #include "chrome/browser/sync/syncable/directory_manager.h" |
| #include "chrome/browser/sync/syncable/model_type_payload_map.h" |
| -#include "chrome/common/chrome_switches.h" |
| using syncable::ScopedDirLookup; |
| @@ -27,7 +26,10 @@ using syncable::MODEL_TYPE_COUNT; |
| using syncable::ModelTypeSet; |
| using syncable::ModelTypeSetToString; |
| -DownloadUpdatesCommand::DownloadUpdatesCommand() {} |
| +DownloadUpdatesCommand::DownloadUpdatesCommand( |
| + bool include_syncable_bookmarks) |
| + : include_syncable_bookmarks_(include_syncable_bookmarks) {} |
| + |
| DownloadUpdatesCommand::~DownloadUpdatesCommand() {} |
| SyncerError DownloadUpdatesCommand::ExecuteImpl(SyncSession* session) { |
| @@ -39,10 +41,7 @@ SyncerError DownloadUpdatesCommand::ExecuteImpl(SyncSession* session) { |
| ClientToServerMessage::GET_UPDATES); |
| GetUpdatesMessage* get_updates = |
| client_to_server_message.mutable_get_updates(); |
| - if (CommandLine::ForCurrentProcess()->HasSwitch( |
| - switches::kCreateMobileBookmarksFolder)) { |
| - get_updates->set_include_syncable_bookmarks(true); |
| - } |
| + get_updates->set_include_syncable_bookmarks(include_syncable_bookmarks_); |
|
Nicolas Zea
2012/02/27 20:03:12
So is this always included in the getupdates if it
akalin
2012/02/27 22:04:18
I don't think so. This was the behavior before bu
Yaron
2012/02/27 22:15:01
It's a misnomer. This flag tells the sync server t
|
| ScopedDirLookup dir(session->context()->directory_manager(), |
| session->context()->account_name()); |