components/sync_driver/model_association_manager.h - Issue 1380693004: [Sync] Fixing sync_driver lint violations and adding PRESUBMIT lint check.

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: components/sync_driver/model_association_manager.h

Issue 1380693004: [Sync] Fixing sync_driver lint violations and adding PRESUBMIT lint check. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cross

Patch Set: Removing lint fixes for revisit files, removing revisit patch dep. Created 5 years, 2 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 | « components/sync_driver/local_device_info_provider_mock.cc ('k') | components/sync_driver/model_association_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/sync_driver/model_association_manager.h

diff --git a/components/sync_driver/model_association_manager.h b/components/sync_driver/model_association_manager.h

index b1491d8222f7c14210fada8b36d97f5cebb2404c..6126280809adf6e68d1cc4cd15fb1d8c3d5f26c9 100644

--- a/components/sync_driver/model_association_manager.h

+++ b/components/sync_driver/model_association_manager.h

@@ -86,7 +86,7 @@ class ModelAssociationManager {

// Dependency injection. crbug.com/129212.

base::OneShotTimer* GetTimerForTesting();

- State state() const { return state_; }

+ State state() const { return state_; }

private:

// Called at the end of association to reset state to prepare for next