summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-21 22:15:40 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-21 22:15:40 +0000
commitad788b79688b6b9f88a3ccaaa944648123230cc5 (patch)
tree170b88eccc14ed1ff2ed2afa3c9461935c7f00b3
parent9d152d697a4a28343d6954ba7f9d3fb918459d27 (diff)
downloadchromium_src-ad788b79688b6b9f88a3ccaaa944648123230cc5.zip
chromium_src-ad788b79688b6b9f88a3ccaaa944648123230cc5.tar.gz
chromium_src-ad788b79688b6b9f88a3ccaaa944648123230cc5.tar.bz2
Sync only real extensions (i.e., not themes nor apps) in extensions sync.
BUG=47079 TEST=manual: with two computers with extensions sync turned on, added an app on one computer and made sure it didn't show up on another Review URL: http://codereview.chromium.org/2847022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50394 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/sync/glue/extension_change_processor.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/sync/glue/extension_change_processor.cc b/chrome/browser/sync/glue/extension_change_processor.cc
index 36a7dc1..31501e8 100644
--- a/chrome/browser/sync/glue/extension_change_processor.cc
+++ b/chrome/browser/sync/glue/extension_change_processor.cc
@@ -52,6 +52,9 @@ void ExtensionChangeProcessor::Observe(NotificationType type,
DCHECK_EQ(Source<Profile>(source).ptr(), profile_);
Extension* extension = Details<Extension>(details).ptr();
CHECK(extension);
+ if (!IsExtensionSyncable(*extension)) {
+ return;
+ }
const std::string& id = extension->id();
LOG(INFO) << "Got change notification of type " << type.value
<< " for extension " << id;
@@ -67,8 +70,6 @@ void ExtensionChangeProcessor::Observe(NotificationType type,
<< type.value;
break;
}
-
- return;
}
void ExtensionChangeProcessor::ApplyChangesFromSyncModel(