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

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

Issue 9699057: [Sync] Move 'sync' target to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Tim's comments Created 8 years, 9 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 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/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "chrome/browser/sync/internal_api/includes/unrecoverable_error_handler. h"
17 #include "chrome/browser/sync/glue/data_type_controller.h" 16 #include "chrome/browser/sync/glue/data_type_controller.h"
18 #include "chrome/browser/sync/glue/data_type_error_handler.h" 17 #include "chrome/browser/sync/glue/data_type_error_handler.h"
19 #include "chrome/browser/sync/glue/model_associator.h" 18 #include "chrome/browser/sync/glue/model_associator.h"
19 #include "sync/util/unrecoverable_error_handler.h"
20 20
21 class BookmarkModel; 21 class BookmarkModel;
22 class BookmarkNode; 22 class BookmarkNode;
23 23
24 namespace sync_api { 24 namespace sync_api {
25 class BaseNode; 25 class BaseNode;
26 struct UserShare; 26 struct UserShare;
27 } 27 }
28 28
29 namespace browser_sync { 29 namespace browser_sync {
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 base::WeakPtrFactory<BookmarkModelAssociator> weak_factory_; 146 base::WeakPtrFactory<BookmarkModelAssociator> weak_factory_;
147 147
148 int number_of_new_sync_nodes_created_at_association_; 148 int number_of_new_sync_nodes_created_at_association_;
149 149
150 DISALLOW_COPY_AND_ASSIGN(BookmarkModelAssociator); 150 DISALLOW_COPY_AND_ASSIGN(BookmarkModelAssociator);
151 }; 151 };
152 152
153 } // namespace browser_sync 153 } // namespace browser_sync
154 154
155 #endif // CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_ 155 #endif // CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/backend_data_type_configurer.h ('k') | chrome/browser/sync/glue/bookmark_model_associator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698