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

Unified Diff: components/sync_driver/model_association_manager.cc

Issue 133503011: Move files from //chrome/browser/sync to sync_driver component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: components/sync_driver/model_association_manager.cc
diff --git a/chrome/browser/sync/glue/model_association_manager.cc b/components/sync_driver/model_association_manager.cc
similarity index 98%
rename from chrome/browser/sync/glue/model_association_manager.cc
rename to components/sync_driver/model_association_manager.cc
index 8b0f7a413ce747d0af6b574955b788d4c4db51d2..723c73ee0eee15cefac617ae41914ef28a7f489f 100644
--- a/chrome/browser/sync/glue/model_association_manager.cc
+++ b/components/sync_driver/model_association_manager.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/sync/glue/model_association_manager.h"
+#include "components/sync_driver/model_association_manager.h"
#include <algorithm>
#include <functional>
@@ -11,10 +11,8 @@
#include "base/logging.h"
#include "base/message_loop/message_loop.h"
#include "base/metrics/histogram.h"
-#include "content/public/browser/browser_thread.h"
#include "sync/internal_api/public/base/model_type.h"
-using content::BrowserThread;
using syncer::ModelTypeSet;
namespace browser_sync {
@@ -336,8 +334,6 @@ void ModelAssociationManager::TypeStartCallback(
DataTypeController::StartResult start_result,
const syncer::SyncMergeResult& local_merge_result,
const syncer::SyncMergeResult& syncer_merge_result) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
blundell 2014/02/01 13:18:32 Do you think it's worth preserving this DCHECK by
Nicolas Zea 2014/02/03 19:21:36 Removing it is fine, all these classes are UI thre
-
// TODO(haitaol): temporary fix for 335606.
if (slow_types_.Has(type))
return;
« no previous file with comments | « components/sync_driver/model_association_manager.h ('k') | components/sync_driver/model_association_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698