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

Unified Diff: chrome/browser/sync/glue/extension_data.cc

Issue 6902054: [Sync] Rip out overly-complicated ExtensionData class (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed asargent's comments Created 9 years, 8 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
« no previous file with comments | « chrome/browser/sync/glue/extension_data.h ('k') | chrome/browser/sync/glue/extension_data_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/extension_data.cc
diff --git a/chrome/browser/sync/glue/extension_data.cc b/chrome/browser/sync/glue/extension_data.cc
deleted file mode 100644
index c62c3620603109b77530650d8ae2418cb3037470..0000000000000000000000000000000000000000
--- a/chrome/browser/sync/glue/extension_data.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// 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/extension_data.h"
-
-#include "base/logging.h"
-#include "chrome/browser/sync/glue/extension_util.h"
-
-namespace browser_sync {
-
-ExtensionData ExtensionData::FromData(
- Source source, const sync_pb::ExtensionSpecifics& data) {
- DcheckIsExtensionSpecificsValid(data);
- ExtensionData extension_data;
- extension_data.merged_data_ = extension_data.source_data_[source] = data;
- DCHECK(AreExtensionSpecificsEqual(extension_data.merged_data(), data));
- DCHECK(!extension_data.NeedsUpdate(source));
- return extension_data;
-}
-
-ExtensionData::~ExtensionData() {}
-
-const sync_pb::ExtensionSpecifics& ExtensionData::merged_data() const {
- DcheckIsExtensionSpecificsValid(merged_data_);
- return merged_data_;
-}
-
-bool ExtensionData::NeedsUpdate(Source source) const {
- SourceDataMap::const_iterator it = source_data_.find(source);
- return
- (it == source_data_.end()) ||
- !AreExtensionSpecificsEqual(it->second, merged_data_);
-}
-
-void ExtensionData::SetData(
- Source source, bool merge_user_properties,
- const sync_pb::ExtensionSpecifics& data) {
- DcheckIsExtensionSpecificsValid(data);
- source_data_[source] = data;
- MergeExtensionSpecifics(data, merge_user_properties, &merged_data_);
- DcheckIsExtensionSpecificsValid(merged_data_);
-}
-
-void ExtensionData::ResolveData(Source source) {
- source_data_[source] = merged_data_;
- DCHECK(!NeedsUpdate(source));
-}
-
-ExtensionData::ExtensionData() {}
-
-} // namespace browser_sync
« no previous file with comments | « chrome/browser/sync/glue/extension_data.h ('k') | chrome/browser/sync/glue/extension_data_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698