| OLD | NEW |
| 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 """An implementation of the server side of the Chromium sync protocol. | 5 """An implementation of the server side of the Chromium sync protocol. |
| 6 | 6 |
| 7 The details of the protocol are described mostly by comments in the protocol | 7 The details of the protocol are described mostly by comments in the protocol |
| 8 buffer definition at chrome/browser/sync/protocol/sync.proto. | 8 buffer definition at chrome/browser/sync/protocol/sync.proto. |
| 9 """ | 9 """ |
| 10 | 10 |
| (...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 465 PermanentItem('google_chrome_history_delete_directives', | 465 PermanentItem('google_chrome_history_delete_directives', |
| 466 name='History Delete Directives', | 466 name='History Delete Directives', |
| 467 parent_tag=ROOT_ID, | 467 parent_tag=ROOT_ID, |
| 468 sync_type=HISTORY_DELETE_DIRECTIVE), | 468 sync_type=HISTORY_DELETE_DIRECTIVE), |
| 469 PermanentItem('google_chrome_nigori', name='Nigori', | 469 PermanentItem('google_chrome_nigori', name='Nigori', |
| 470 parent_tag=ROOT_ID, sync_type=NIGORI), | 470 parent_tag=ROOT_ID, sync_type=NIGORI), |
| 471 PermanentItem('google_chrome_passwords', name='Passwords', | 471 PermanentItem('google_chrome_passwords', name='Passwords', |
| 472 parent_tag=ROOT_ID, sync_type=PASSWORD), | 472 parent_tag=ROOT_ID, sync_type=PASSWORD), |
| 473 PermanentItem('google_chrome_preferences', name='Preferences', | 473 PermanentItem('google_chrome_preferences', name='Preferences', |
| 474 parent_tag=ROOT_ID, sync_type=PREFERENCE), | 474 parent_tag=ROOT_ID, sync_type=PREFERENCE), |
| 475 PermanentItem('google_chrome_preferences', name='Synced Notifications', | 475 PermanentItem('google_chrome_synced_notifications', |
| 476 name='Synced Notifications', |
| 476 parent_tag=ROOT_ID, sync_type=SYNCED_NOTIFICATION), | 477 parent_tag=ROOT_ID, sync_type=SYNCED_NOTIFICATION), |
| 477 PermanentItem('google_chrome_search_engines', name='Search Engines', | 478 PermanentItem('google_chrome_search_engines', name='Search Engines', |
| 478 parent_tag=ROOT_ID, sync_type=SEARCH_ENGINE), | 479 parent_tag=ROOT_ID, sync_type=SEARCH_ENGINE), |
| 479 PermanentItem('google_chrome_sessions', name='Sessions', | 480 PermanentItem('google_chrome_sessions', name='Sessions', |
| 480 parent_tag=ROOT_ID, sync_type=SESSION), | 481 parent_tag=ROOT_ID, sync_type=SESSION), |
| 481 PermanentItem('google_chrome_themes', name='Themes', | 482 PermanentItem('google_chrome_themes', name='Themes', |
| 482 parent_tag=ROOT_ID, sync_type=THEME), | 483 parent_tag=ROOT_ID, sync_type=THEME), |
| 483 PermanentItem('google_chrome_typed_urls', name='Typed URLs', | 484 PermanentItem('google_chrome_typed_urls', name='Typed URLs', |
| 484 parent_tag=ROOT_ID, sync_type=TYPED_URL), | 485 parent_tag=ROOT_ID, sync_type=TYPED_URL), |
| 485 ] | 486 ] |
| (...skipping 876 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1362 sending_nigori_node = False | 1363 sending_nigori_node = False |
| 1363 for entry in entries: | 1364 for entry in entries: |
| 1364 if entry.name == 'Nigori': | 1365 if entry.name == 'Nigori': |
| 1365 sending_nigori_node = True | 1366 sending_nigori_node = True |
| 1366 reply = update_response.entries.add() | 1367 reply = update_response.entries.add() |
| 1367 reply.CopyFrom(entry) | 1368 reply.CopyFrom(entry) |
| 1368 update_sieve.SaveProgress(new_timestamp, update_response) | 1369 update_sieve.SaveProgress(new_timestamp, update_response) |
| 1369 | 1370 |
| 1370 if update_request.need_encryption_key or sending_nigori_node: | 1371 if update_request.need_encryption_key or sending_nigori_node: |
| 1371 update_response.encryption_keys.extend(self.account.GetKeystoreKeys()) | 1372 update_response.encryption_keys.extend(self.account.GetKeystoreKeys()) |
| OLD | NEW |