chrome/browser/sync/glue/extension_model_associator.h - Issue 7461098: Reland 87645 with clang fixes.

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/extension_model_associator.h

Issue 7461098: Reland 87645 with clang fixes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 9 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:

Index: chrome/browser/sync/glue/extension_model_associator.h

diff --git a/chrome/browser/sync/glue/extension_model_associator.h b/chrome/browser/sync/glue/extension_model_associator.h

index b71a281655907633ac8050c9ff011ce08683a780..48f51b21426598cd4286434052b1e6412b8ba7e1 100644

--- a/chrome/browser/sync/glue/extension_model_associator.h

+++ b/chrome/browser/sync/glue/extension_model_associator.h

@@ -7,6 +7,7 @@

#pragma once

#include "base/basictypes.h"

+#include "chrome/browser/sync/api/sync_error.h"

#include "chrome/browser/sync/glue/extension_sync_traits.h"

#include "chrome/browser/sync/glue/model_associator.h"

#include "chrome/browser/sync/syncable/model_type.h"

@@ -32,8 +33,8 @@ class ExtensionModelAssociator : public AssociatorInterface {

static syncable::ModelType model_type() { return syncable::EXTENSIONS; }

// AssociatorInterface implementation.

- virtual bool AssociateModels();

- virtual bool DisassociateModels();

+ virtual bool AssociateModels(SyncError* error);

+ virtual bool DisassociateModels(SyncError* error);

virtual bool SyncModelHasUserCreatedNodes(bool* has_nodes);

virtual void AbortAssociation();

virtual bool CryptoReadyIfNecessary();