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

Side by Side Diff: sync/syncable/directory.h

Issue 16667019: Rename base/hash_tables to base/containers/hash_tables. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
« no previous file with comments | « remoting/protocol/util.cc ('k') | sync/syncable/syncable_id.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 SYNC_SYNCABLE_DIRECTORY_H_ 5 #ifndef SYNC_SYNCABLE_DIRECTORY_H_
6 #define SYNC_SYNCABLE_DIRECTORY_H_ 6 #define SYNC_SYNCABLE_DIRECTORY_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/containers/hash_tables.h"
14 #include "base/file_util.h" 15 #include "base/file_util.h"
15 #include "base/gtest_prod_util.h" 16 #include "base/gtest_prod_util.h"
16 #include "base/hash_tables.h"
17 #include "sync/base/sync_export.h" 17 #include "sync/base/sync_export.h"
18 #include "sync/internal_api/public/util/report_unrecoverable_error_function.h" 18 #include "sync/internal_api/public/util/report_unrecoverable_error_function.h"
19 #include "sync/internal_api/public/util/weak_handle.h" 19 #include "sync/internal_api/public/util/weak_handle.h"
20 #include "sync/syncable/dir_open_result.h" 20 #include "sync/syncable/dir_open_result.h"
21 #include "sync/syncable/entry_kernel.h" 21 #include "sync/syncable/entry_kernel.h"
22 #include "sync/syncable/metahandle_set.h" 22 #include "sync/syncable/metahandle_set.h"
23 #include "sync/syncable/parent_child_index.h" 23 #include "sync/syncable/parent_child_index.h"
24 #include "sync/syncable/syncable_delete_journal.h" 24 #include "sync/syncable/syncable_delete_journal.h"
25 25
26 namespace syncer { 26 namespace syncer {
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 // are deleted in native models as well. 545 // are deleted in native models as well.
546 scoped_ptr<DeleteJournal> delete_journal_; 546 scoped_ptr<DeleteJournal> delete_journal_;
547 547
548 DISALLOW_COPY_AND_ASSIGN(Directory); 548 DISALLOW_COPY_AND_ASSIGN(Directory);
549 }; 549 };
550 550
551 } // namespace syncable 551 } // namespace syncable
552 } // namespace syncer 552 } // namespace syncer
553 553
554 #endif // SYNC_SYNCABLE_DIRECTORY_H_ 554 #endif // SYNC_SYNCABLE_DIRECTORY_H_
OLDNEW
« no previous file with comments | « remoting/protocol/util.cc ('k') | sync/syncable/syncable_id.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698