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

Side by Side Diff: chrome/browser/sync/glue/bookmark_model_associator.cc

Issue 7879006: Delete Tracked, and move Location to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 9 years, 3 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
OLDNEW
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/glue/bookmark_model_associator.h" 5 #include "chrome/browser/sync/glue/bookmark_model_associator.h"
6 6
7 #include <stack> 7 #include <stack>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/hash_tables.h" 10 #include "base/hash_tables.h"
11 #include "base/location.h"
11 #include "base/message_loop.h" 12 #include "base/message_loop.h"
12 #include "base/task.h" 13 #include "base/task.h"
13 #include "base/tracked.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
15 #include "chrome/browser/bookmarks/bookmark_model.h" 15 #include "chrome/browser/bookmarks/bookmark_model.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/sync/api/sync_error.h" 17 #include "chrome/browser/sync/api/sync_error.h"
18 #include "chrome/browser/sync/glue/bookmark_change_processor.h" 18 #include "chrome/browser/sync/glue/bookmark_change_processor.h"
19 #include "chrome/browser/sync/internal_api/read_node.h" 19 #include "chrome/browser/sync/internal_api/read_node.h"
20 #include "chrome/browser/sync/internal_api/read_transaction.h" 20 #include "chrome/browser/sync/internal_api/read_transaction.h"
21 #include "chrome/browser/sync/internal_api/write_node.h" 21 #include "chrome/browser/sync/internal_api/write_node.h"
22 #include "chrome/browser/sync/internal_api/write_transaction.h" 22 #include "chrome/browser/sync/internal_api/write_transaction.h"
23 #include "chrome/browser/sync/util/cryptographer.h" 23 #include "chrome/browser/sync/util/cryptographer.h"
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 bool BookmarkModelAssociator::CryptoReadyIfNecessary() { 604 bool BookmarkModelAssociator::CryptoReadyIfNecessary() {
605 // We only access the cryptographer while holding a transaction. 605 // We only access the cryptographer while holding a transaction.
606 sync_api::ReadTransaction trans(FROM_HERE, user_share_); 606 sync_api::ReadTransaction trans(FROM_HERE, user_share_);
607 const syncable::ModelTypeSet& encrypted_types = 607 const syncable::ModelTypeSet& encrypted_types =
608 sync_api::GetEncryptedTypes(&trans); 608 sync_api::GetEncryptedTypes(&trans);
609 return encrypted_types.count(syncable::BOOKMARKS) == 0 || 609 return encrypted_types.count(syncable::BOOKMARKS) == 0 ||
610 trans.GetCryptographer()->is_ready(); 610 trans.GetCryptographer()->is_ready();
611 } 611 }
612 612
613 } // namespace browser_sync 613 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/bookmark_change_processor.cc ('k') | chrome/browser/sync/glue/data_type_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698