diff options
| author | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-24 20:38:17 +0000 |
|---|---|---|
| committer | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-24 20:38:17 +0000 |
| commit | d57938608370c7d42a351d0c614b98ddc4bb242b (patch) | |
| tree | 19d20aefb782b7daf8e8bb53e57e8307ed35e59d /sync/syncable/directory.h | |
| parent | 5b6d0437545a1b72251c7238e45fa749c6345c2d (diff) | |
| download | chromium_src-d57938608370c7d42a351d0c614b98ddc4bb242b.zip chromium_src-d57938608370c7d42a351d0c614b98ddc4bb242b.tar.gz chromium_src-d57938608370c7d42a351d0c614b98ddc4bb242b.tar.bz2 | |
[sync] Componentize sync: Part 7: Eliminate more filename collisions in sync.gyp
In order to move src/sync into its own compoent, all the static_library
targets in sync.gyp need to be converted to targets of type 'none' and
rolled into one sync target of type component. This is currently blocked
by duplicate .cc filenames in syncable and internal_api, which flags an
error while running gyp. The offending files are
{internal_api|syncable}/delete_journal.cc.
This patch renames syncable/delete_journal.{h|cc} to
syncable/syncable_delete_journal.{h|cc}.
This is a continuation of https://codereview.chromium.org/11638018.
BUG=136928
Review URL: https://codereview.chromium.org/12033084
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178639 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/syncable/directory.h')
| -rw-r--r-- | sync/syncable/directory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sync/syncable/directory.h b/sync/syncable/directory.h index 5f2ae90..6aa10b2 100644 --- a/sync/syncable/directory.h +++ b/sync/syncable/directory.h @@ -1,4 +1,4 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -14,11 +14,11 @@ #include "sync/base/sync_export.h" #include "sync/internal_api/public/util/report_unrecoverable_error_function.h" #include "sync/internal_api/public/util/weak_handle.h" -#include "sync/syncable/delete_journal.h" #include "sync/syncable/dir_open_result.h" #include "sync/syncable/entry_kernel.h" #include "sync/syncable/metahandle_set.h" #include "sync/syncable/scoped_kernel_lock.h" +#include "sync/syncable/syncable_delete_journal.h" namespace syncer { |