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

Unified Diff: ios/chrome/browser/sync/ios_chrome_sync_client.mm

Issue 2511723002: Enable RL sync by default on iOS (Closed)
Patch Set: rebase Created 4 years, 1 month 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
« no previous file with comments | « ios/chrome/browser/sync/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/sync/ios_chrome_sync_client.mm
diff --git a/ios/chrome/browser/sync/ios_chrome_sync_client.mm b/ios/chrome/browser/sync/ios_chrome_sync_client.mm
index a9a7efaaba55bb687c41156ba7a17e878b814309..d273005ab115ca308fc85c76515382536a4431be 100644
--- a/ios/chrome/browser/sync/ios_chrome_sync_client.mm
+++ b/ios/chrome/browser/sync/ios_chrome_sync_client.mm
@@ -25,7 +25,8 @@
#include "components/keyed_service/core/service_access_type.h"
#include "components/password_manager/core/browser/password_store.h"
#include "components/password_manager/sync/browser/password_model_worker.h"
-#include "components/reading_list/reading_list_model.h"
+#include "components/reading_list/core/reading_list_switches.h"
+#include "components/reading_list/ios/reading_list_model.h"
#include "components/search_engines/search_engine_data_type_controller.h"
#include "components/signin/core/browser/profile_oauth2_token_service.h"
#include "components/sync/base/extensions_activity.h"
@@ -342,11 +343,10 @@ IOSChromeSyncClient::GetSyncBridgeForModelType(syncer::ModelType type) {
->GetDeviceInfoSyncBridge()
->AsWeakPtr();
case syncer::READING_LIST: {
+ DCHECK(reading_list::switches::IsReadingListEnabled());
ReadingListModel* reading_list_model =
ReadingListModelFactory::GetForBrowserState(browser_state_);
- if (reading_list_model)
- return reading_list_model->GetModelTypeSyncBridge()->AsWeakPtr();
- return base::WeakPtr<syncer::ModelTypeSyncBridge>();
+ return reading_list_model->GetModelTypeSyncBridge()->AsWeakPtr();
}
default:
NOTREACHED();
« no previous file with comments | « ios/chrome/browser/sync/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698