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

Side by Side Diff: chrome/browser/sync/glue/app_model_associator.h

Issue 7453014: [Sync] Refactor sync datatype error handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and really really fix compile 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_SYNC_GLUE_APP_MODEL_ASSOCIATOR_H_ 5 #ifndef CHROME_BROWSER_SYNC_GLUE_APP_MODEL_ASSOCIATOR_H_
6 #define CHROME_BROWSER_SYNC_GLUE_APP_MODEL_ASSOCIATOR_H_ 6 #define CHROME_BROWSER_SYNC_GLUE_APP_MODEL_ASSOCIATOR_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "chrome/browser/sync/glue/extension_sync_traits.h" 10 #include "chrome/browser/sync/glue/extension_sync_traits.h"
(...skipping 14 matching lines...) Expand all
25 public: 25 public:
26 // Does not take ownership of |extension_service| or |user_share|. 26 // Does not take ownership of |extension_service| or |user_share|.
27 AppModelAssociator(ExtensionServiceInterface* extension_service, 27 AppModelAssociator(ExtensionServiceInterface* extension_service,
28 sync_api::UserShare* user_share); 28 sync_api::UserShare* user_share);
29 virtual ~AppModelAssociator(); 29 virtual ~AppModelAssociator();
30 30
31 // Used by profile_sync_test_util.h. 31 // Used by profile_sync_test_util.h.
32 static syncable::ModelType model_type() { return syncable::APPS; } 32 static syncable::ModelType model_type() { return syncable::APPS; }
33 33
34 // AssociatorInterface implementation. 34 // AssociatorInterface implementation.
35 virtual bool AssociateModels(); 35 virtual bool AssociateModels(SyncError* error);
36 virtual bool DisassociateModels(); 36 virtual bool DisassociateModels(SyncError* error);
37 virtual bool SyncModelHasUserCreatedNodes(bool* has_nodes); 37 virtual bool SyncModelHasUserCreatedNodes(bool* has_nodes);
38 virtual void AbortAssociation(); 38 virtual void AbortAssociation();
39 virtual bool CryptoReadyIfNecessary(); 39 virtual bool CryptoReadyIfNecessary();
40 private: 40 private:
41 const ExtensionSyncTraits traits_; 41 const ExtensionSyncTraits traits_;
42 ExtensionServiceInterface* const extension_service_; 42 ExtensionServiceInterface* const extension_service_;
43 sync_api::UserShare* const user_share_; 43 sync_api::UserShare* const user_share_;
44 44
45 DISALLOW_COPY_AND_ASSIGN(AppModelAssociator); 45 DISALLOW_COPY_AND_ASSIGN(AppModelAssociator);
46 }; 46 };
47 47
48 } // namespace browser_sync 48 } // namespace browser_sync
49 49
50 #endif // CHROME_BROWSER_SYNC_GLUE_APP_MODEL_ASSOCIATOR_H_ 50 #endif // CHROME_BROWSER_SYNC_GLUE_APP_MODEL_ASSOCIATOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698