chrome/browser/sync/internal_api/sync_manager.cc - Issue 8468023: Move encryption related files from util folder to encryption folder.

Side by Side Diff: chrome/browser/sync/internal_api/sync_manager.cc

Issue 8468023: Move encryption related files from util folder to encryption folder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: For review. Created 9 years, 1 month 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

« chrome/browser/sync/engine/nigori_util.cc ('K') | « chrome/browser/sync/internal_api/base_transaction.cc ('k') | chrome/browser/sync/internal_api/syncapi_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 #include "chrome/browser/sync/internal_api/sync_manager.h"	5 #include "chrome/browser/sync/internal_api/sync_manager.h"

6	6

7 #include <string>	7 #include <string>

8	8

9 #include "base/base64.h"	9 #include "base/base64.h"

10 #include "base/command_line.h"	10 #include "base/command_line.h"

(...skipping 29 matching lines...) Expand all Loading...
40 #include "chrome/browser/sync/js/js_sync_manager_observer.h"	40 #include "chrome/browser/sync/js/js_sync_manager_observer.h"

41 #include "chrome/browser/sync/notifier/sync_notifier.h"	41 #include "chrome/browser/sync/notifier/sync_notifier.h"

42 #include "chrome/browser/sync/notifier/sync_notifier_observer.h"	42 #include "chrome/browser/sync/notifier/sync_notifier_observer.h"

43 #include "chrome/browser/sync/protocol/proto_value_conversions.h"	43 #include "chrome/browser/sync/protocol/proto_value_conversions.h"

44 #include "chrome/browser/sync/protocol/sync.pb.h"	44 #include "chrome/browser/sync/protocol/sync.pb.h"

45 #include "chrome/browser/sync/syncable/directory_change_delegate.h"	45 #include "chrome/browser/sync/syncable/directory_change_delegate.h"

46 #include "chrome/browser/sync/syncable/directory_manager.h"	46 #include "chrome/browser/sync/syncable/directory_manager.h"

47 #include "chrome/browser/sync/syncable/model_type.h"	47 #include "chrome/browser/sync/syncable/model_type.h"

48 #include "chrome/browser/sync/syncable/model_type_payload_map.h"	48 #include "chrome/browser/sync/syncable/model_type_payload_map.h"

49 #include "chrome/browser/sync/syncable/syncable.h"	49 #include "chrome/browser/sync/syncable/syncable.h"

50 #include "chrome/browser/sync/util/cryptographer.h"	50 #include "chrome/browser/sync/encryption/cryptographer.h"

51 #include "chrome/common/chrome_switches.h"	51 #include "chrome/common/chrome_switches.h"

52 #include "net/base/network_change_notifier.h"	52 #include "net/base/network_change_notifier.h"

53	53

54 using std::string;	54 using std::string;

55	55

56 using base::TimeDelta;	56 using base::TimeDelta;

57 using browser_sync::AllStatus;	57 using browser_sync::AllStatus;

58 using browser_sync::Cryptographer;	58 using browser_sync::Cryptographer;

59 using browser_sync::JsArgList;	59 using browser_sync::JsArgList;

60 using browser_sync::JsBackend;	60 using browser_sync::JsBackend;

(...skipping 2048 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2109 lookup->GetDownloadProgress(*i, &marker);	2109 lookup->GetDownloadProgress(*i, &marker);

2110	2110

2111 if (marker.token().empty())	2111 if (marker.token().empty())

2112 result.insert(*i);	2112 result.insert(*i);

2113	2113

2114 }	2114 }

2115 return result;	2115 return result;

2116 }	2116 }

2117	2117

2118 } // namespace sync_api	2118 } // namespace sync_api

OLD	NEW