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

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

Issue 8804026: Move unrecoverable_error_handler file to util folder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix. Created 9 years 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
« no previous file with comments | « no previous file | chrome/browser/sync/glue/change_processor_mock.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_BOOKMARK_MODEL_ASSOCIATOR_H_ 5 #ifndef CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_
6 #define CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_ 6 #define CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
11 #include <string> 11 #include <string>
12 12
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
15 #include "base/task.h" 15 #include "base/task.h"
16 #include "chrome/browser/sync/unrecoverable_error_handler.h" 16 #include "chrome/browser/sync/internal_api/includes/unrecoverable_error_handler. h"
17 #include "chrome/browser/sync/glue/model_associator.h" 17 #include "chrome/browser/sync/glue/model_associator.h"
18 18
19 class BookmarkModel; 19 class BookmarkModel;
20 class BookmarkNode; 20 class BookmarkNode;
21 21
22 namespace sync_api { 22 namespace sync_api {
23 class BaseNode; 23 class BaseNode;
24 struct UserShare; 24 struct UserShare;
25 } 25 }
26 26
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 ScopedRunnableMethodFactory<BookmarkModelAssociator> persist_associations_; 136 ScopedRunnableMethodFactory<BookmarkModelAssociator> persist_associations_;
137 137
138 int number_of_new_sync_nodes_created_at_association_; 138 int number_of_new_sync_nodes_created_at_association_;
139 139
140 DISALLOW_COPY_AND_ASSIGN(BookmarkModelAssociator); 140 DISALLOW_COPY_AND_ASSIGN(BookmarkModelAssociator);
141 }; 141 };
142 142
143 } // namespace browser_sync 143 } // namespace browser_sync
144 144
145 #endif // CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_ 145 #endif // CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync/glue/change_processor_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698