summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/engine/download_updates_command.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-29 00:14:40 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-29 00:14:40 +0000
commit43e58d0bc3e7ba36acf145c6d8e753d530b15599 (patch)
treeac35c77e54a83c5e40e6fedd1dffaa6ab4620d48 /chrome/browser/sync/engine/download_updates_command.cc
parent5fd208589e1742da7b909653d9c0aa311bb78bf5 (diff)
downloadchromium_src-43e58d0bc3e7ba36acf145c6d8e753d530b15599.zip
chromium_src-43e58d0bc3e7ba36acf145c6d8e753d530b15599.tar.gz
chromium_src-43e58d0bc3e7ba36acf145c6d8e753d530b15599.tar.bz2
[Sync] Remove --create-mobile-bookmarks-folder
Instead, check defined(OS_ANDROID) and add {create,expect}_mobile_bookmarks_folder switches. BUG=113723 TEST= Review URL: https://chromiumcodereview.appspot.com/9453036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124065 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/engine/download_updates_command.cc')
-rw-r--r--chrome/browser/sync/engine/download_updates_command.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/sync/engine/download_updates_command.cc b/chrome/browser/sync/engine/download_updates_command.cc
index e66adae..2e02e96 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/model_type_payload_map.h"
#include "chrome/browser/sync/syncable/syncable.h"
-#include "chrome/common/chrome_switches.h"
using sync_pb::DebugInfo;
@@ -25,7 +24,10 @@ using syncable::MODEL_TYPE_COUNT;
using syncable::ModelTypeSet;
using syncable::ModelTypeSetToString;
-DownloadUpdatesCommand::DownloadUpdatesCommand() {}
+DownloadUpdatesCommand::DownloadUpdatesCommand(
+ bool create_mobile_bookmarks_folder)
+ : create_mobile_bookmarks_folder_(create_mobile_bookmarks_folder) {}
+
DownloadUpdatesCommand::~DownloadUpdatesCommand() {}
SyncerError DownloadUpdatesCommand::ExecuteImpl(SyncSession* session) {
@@ -37,10 +39,8 @@ 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_create_mobile_bookmarks_folder(
+ create_mobile_bookmarks_folder_);
syncable::Directory* dir = session->context()->directory();