summaryrefslogtreecommitdiffstats
path: root/sync/internal_api/public/util/weak_handle.h
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-21 20:48:36 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-21 20:48:36 +0000
commitd78354a5e74c5208dd9ebe83717b22223c1e1272 (patch)
tree4c616bbbfbf1776055d250644e1a47d435b11c8a /sync/internal_api/public/util/weak_handle.h
parent41fed979ae412d2475a2860ea1ec95531bebb5af (diff)
downloadchromium_src-d78354a5e74c5208dd9ebe83717b22223c1e1272.zip
chromium_src-d78354a5e74c5208dd9ebe83717b22223c1e1272.tar.gz
chromium_src-d78354a5e74c5208dd9ebe83717b22223c1e1272.tar.bz2
[Sync] Rename browser_sync to csync in sync/
Update all references from chrome. Leave possibly-extraneous csync:: qualifications in sync/ for now. (This will be cleaned up once everything in sync/ is in csync::.) BUG=128060 TEST= TBR=jhawkins@chromium.org Review URL: https://chromiumcodereview.appspot.com/10600002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/public/util/weak_handle.h')
-rw-r--r--sync/internal_api/public/util/weak_handle.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sync/internal_api/public/util/weak_handle.h b/sync/internal_api/public/util/weak_handle.h
index 653da60..fc7909e 100644
--- a/sync/internal_api/public/util/weak_handle.h
+++ b/sync/internal_api/public/util/weak_handle.h
@@ -68,7 +68,7 @@ namespace tracked_objects {
class Location;
} // namespace tracked_objects
-namespace browser_sync {
+namespace csync {
template <typename T> class WeakHandle;
@@ -286,7 +286,7 @@ class WeakHandle {
// Note that this doesn't override the regular copy constructor, so
// that one can be called on any thread.
template <typename U>
- WeakHandle(const browser_sync::WeakHandle<U>& other) // NOLINT
+ WeakHandle(const csync::WeakHandle<U>& other) // NOLINT
: core_(
other.IsInitialized() ?
new internal::WeakHandleCore<T>(other.Get()) :
@@ -374,6 +374,6 @@ WeakHandle<T> MakeWeakHandle(const base::WeakPtr<T>& ptr) {
return WeakHandle<T>(ptr);
}
-} // namespace browser_sync
+} // namespace csync
#endif // SYNC_UTIL_WEAK_HANDLE_H_