diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/sync/glue/extension_sync.cc | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/sync/glue/extension_sync.cc')
| -rw-r--r-- | chrome/browser/sync/glue/extension_sync.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/sync/glue/extension_sync.cc b/chrome/browser/sync/glue/extension_sync.cc index 51ccfd4..facf5f1 100644 --- a/chrome/browser/sync/glue/extension_sync.cc +++ b/chrome/browser/sync/glue/extension_sync.cc @@ -268,7 +268,7 @@ void TryUpdateClient( extension_data->merged_data(); DcheckIsExtensionSpecificsValid(specifics); const std::string& id = specifics.id(); - Extension* extension = extensions_service->GetExtensionById(id, true); + const Extension* extension = extensions_service->GetExtensionById(id, true); if (extension) { if (!IsExtensionValidAndSyncable(*extension, allowed_extension_types)) { LOG(DFATAL) << "TryUpdateClient() called for non-syncable extension " @@ -446,7 +446,7 @@ void UpdateClient(const ExtensionSyncTraits& traits, DcheckIsExtensionSpecificsValid(server_data); ExtensionData extension_data = ExtensionData::FromData(ExtensionData::SERVER, server_data); - Extension* extension = + const Extension* extension = extensions_service->GetExtensionById(server_data.id(), true); if (extension) { if (!IsExtensionValidAndSyncable( @@ -478,7 +478,7 @@ void UpdateClient(const ExtensionSyncTraits& traits, void RemoveFromClient(const ExtensionSyncTraits& traits, const std::string& id, ExtensionsService* extensions_service) { - Extension* extension = extensions_service->GetExtensionById(id, true); + const Extension* extension = extensions_service->GetExtensionById(id, true); if (extension) { if (IsExtensionValidAndSyncable(*extension, traits.allowed_extension_types)) { |