| Index: chrome/browser/sync/glue/typed_url_data_type_controller.cc
|
| diff --git a/chrome/browser/sync/glue/typed_url_data_type_controller.cc b/chrome/browser/sync/glue/typed_url_data_type_controller.cc
|
| index 258799939f4e1399f7f835f763f74d3c565e2828..7a56c18c68dbc2386ab92952d410acd98f600302 100644
|
| --- a/chrome/browser/sync/glue/typed_url_data_type_controller.cc
|
| +++ b/chrome/browser/sync/glue/typed_url_data_type_controller.cc
|
| @@ -92,6 +92,22 @@ syncer::ModelSafeGroup TypedUrlDataTypeController::model_safe_group()
|
| return syncer::GROUP_HISTORY;
|
| }
|
|
|
| +void TypedUrlDataTypeController::LoadModels(
|
| + const ModelLoadCallback& model_load_callback) {
|
| + if (profile()->GetPrefs()->GetBoolean(prefs::kSavingBrowserHistoryDisabled)) {
|
| + model_load_callback.Run(
|
| + type(),
|
| + syncer::SyncError(FROM_HERE,
|
| + syncer::SyncError::DATATYPE_ERROR,
|
| + "History sync disabled by policy.",
|
| + type()));
|
| + return;
|
| + }
|
| +
|
| + set_state(MODEL_LOADED);
|
| + model_load_callback.Run(type(), syncer::SyncError());
|
| +}
|
| +
|
| void TypedUrlDataTypeController::SetBackend(history::HistoryBackend* backend) {
|
| DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| backend_ = backend;
|
|
|