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

Side by Side Diff: sync/protocol/sync_protocol_error.h

Issue 263273002: Add a ClientAction used by SyncRollbackManager to notify PSS that rollback is (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 #ifndef SYNC_PROTOCOL_SYNC_PROTOCOL_ERROR_H_ 4 #ifndef SYNC_PROTOCOL_SYNC_PROTOCOL_ERROR_H_
5 #define SYNC_PROTOCOL_SYNC_PROTOCOL_ERROR_H_ 5 #define SYNC_PROTOCOL_SYNC_PROTOCOL_ERROR_H_
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "sync/base/sync_export.h" 10 #include "sync/base/sync_export.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 // Wipe this client of any sync data. 65 // Wipe this client of any sync data.
66 DISABLE_SYNC_ON_CLIENT, 66 DISABLE_SYNC_ON_CLIENT,
67 67
68 // Account is disabled by admin. Stop sync, clear prefs and show message on 68 // Account is disabled by admin. Stop sync, clear prefs and show message on
69 // settings page that account is disabled. 69 // settings page that account is disabled.
70 STOP_SYNC_FOR_DISABLED_ACCOUNT, 70 STOP_SYNC_FOR_DISABLED_ACCOUNT,
71 71
72 // Disable sync and roll back local model to pre-sync state. 72 // Disable sync and roll back local model to pre-sync state.
73 DISABLE_SYNC_AND_ROLLBACK, 73 DISABLE_SYNC_AND_ROLLBACK,
74 74
75 // Generated by SyncRollbackManager to notify ProfileSyncService that
76 // rollback is finished.
77 ROLLBACK_DONE,
78
75 // The default. No action. 79 // The default. No action.
76 UNKNOWN_ACTION 80 UNKNOWN_ACTION
77 }; 81 };
78 82
79 struct SYNC_EXPORT SyncProtocolError { 83 struct SYNC_EXPORT SyncProtocolError {
80 SyncProtocolErrorType error_type; 84 SyncProtocolErrorType error_type;
81 std::string error_description; 85 std::string error_description;
82 std::string url; 86 std::string url;
83 ClientAction action; 87 ClientAction action;
84 ModelTypeSet error_data_types; 88 ModelTypeSet error_data_types;
85 SyncProtocolError(); 89 SyncProtocolError();
86 ~SyncProtocolError(); 90 ~SyncProtocolError();
87 base::DictionaryValue* ToValue() const; 91 base::DictionaryValue* ToValue() const;
88 }; 92 };
89 93
90 SYNC_EXPORT const char* GetSyncErrorTypeString(SyncProtocolErrorType type); 94 SYNC_EXPORT const char* GetSyncErrorTypeString(SyncProtocolErrorType type);
91 SYNC_EXPORT const char* GetClientActionString(ClientAction action); 95 SYNC_EXPORT const char* GetClientActionString(ClientAction action);
92 } // namespace syncer 96 } // namespace syncer
93 #endif // SYNC_PROTOCOL_SYNC_PROTOCOL_ERROR_H_ 97 #endif // SYNC_PROTOCOL_SYNC_PROTOCOL_ERROR_H_
94 98
OLDNEW
« no previous file with comments | « sync/internal_api/sync_rollback_manager_unittest.cc ('k') | sync/protocol/sync_protocol_error.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698