chrome/browser/sync/glue/typed_url_data_type_controller.cc - Issue 388003002: Sync: Display non-severe errors on about:sync in gray color rather than red.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/glue/typed_url_data_type_controller.cc

Issue 388003002: Sync: Display non-severe errors on about:sync in gray color rather than red. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed Windows specific build issue caused by using SEVERITY_ERROR for SyncError::Severity Created 6 years, 5 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

« no previous file with comments | « chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc ('k') | chrome/browser/sync/profile_sync_components_factory_impl.cc » ('j') | chrome/browser/sync/profile_sync_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 fbc9e64a93634273bc950b21a4c3717ede8f83d0..e6044398a852e683b55ca7ef17b147ae0b5092ec 100644

--- a/chrome/browser/sync/glue/typed_url_data_type_controller.cc

+++ b/chrome/browser/sync/glue/typed_url_data_type_controller.cc

@@ -121,10 +121,12 @@ void TypedUrlDataTypeController::OnSavingBrowserHistoryDisabledChanged() {

// generate an unrecoverable error. This can be fixed by restarting

// Chrome (on restart, typed urls will not be a registered type).

if (state() != NOT_RUNNING && state() != STOPPING) {

- profile_sync_service()->DisableDatatype(

- syncer::TYPED_URLS,

+ syncer::SyncError error(

FROM_HERE,

- "History saving is now disabled by policy.");

+ syncer::SyncError::DATATYPE_POLICY_ERROR,

+ "History saving is now disabled by policy.",

+ syncer::TYPED_URLS);

+ profile_sync_service()->DisableDatatype(syncer::TYPED_URLS, error);

}