diff options
| author | skerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-19 17:14:32 +0000 |
|---|---|---|
| committer | skerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-19 17:14:32 +0000 |
| commit | 8ef78fddcb2f0d11dd1600f97f0adba7d104e68e (patch) | |
| tree | 8c11399fa651e69b01b66688f50f3caf43817d61 /chrome/browser/sync | |
| parent | ed748745c9b29696c4510db09a219c1c6863b05a (diff) | |
| download | chromium_src-8ef78fddcb2f0d11dd1600f97f0adba7d104e68e.zip chromium_src-8ef78fddcb2f0d11dd1600f97f0adba7d104e68e.tar.gz chromium_src-8ef78fddcb2f0d11dd1600f97f0adba7d104e68e.tar.bz2 | |
Allow update URLs in external_extensions.json.
Doc updates will follow in another CL.
BUG=48117
TEST=ExtensionsServiceTest.(UpdatePendingExternalCrx,UpdatePendingCrxThemeMismatch,ExternalPrefProvider), ExtensionManagmentTest.ExternalUrlUpdate, manual testing.
Review URL: http://codereview.chromium.org/3005057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56701 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/glue/extension_sync.cc | 9 | ||||
| -rw-r--r-- | chrome/browser/sync/glue/theme_util.cc | 9 |
2 files changed, 11 insertions, 7 deletions
diff --git a/chrome/browser/sync/glue/extension_sync.cc b/chrome/browser/sync/glue/extension_sync.cc index 3b31ab9..b85f677 100644 --- a/chrome/browser/sync/glue/extension_sync.cc +++ b/chrome/browser/sync/glue/extension_sync.cc @@ -292,9 +292,12 @@ void TryUpdateClient( GURL update_url(specifics.update_url()); // TODO(akalin): Replace silent update with a list of enabled // permissions. - extensions_service->AddPendingExtension( - id, update_url, false, true, - specifics.enabled(), specifics.incognito_enabled()); + extensions_service->AddPendingExtensionFromSync( + id, update_url, + PendingExtensionInfo::EXTENSION, + true, // install_silently + specifics.enabled(), + specifics.incognito_enabled()); } DCHECK(!extension_data->NeedsUpdate(ExtensionData::SERVER)); } diff --git a/chrome/browser/sync/glue/theme_util.cc b/chrome/browser/sync/glue/theme_util.cc index a384ef4..47a8604 100644 --- a/chrome/browser/sync/glue/theme_util.cc +++ b/chrome/browser/sync/glue/theme_util.cc @@ -126,16 +126,17 @@ void SetCurrentThemeFromThemeSpecifics( // No extension with this id exists -- we must install it; we do // so by adding it as a pending extension and then triggering an // auto-update cycle. - const bool kIsTheme = true; + const PendingExtensionInfo::ExpectedCrxType kExpectedCrxType = + PendingExtensionInfo::THEME; // Themes don't need to install silently as they just pop up an // informational dialog after installation instead of a // confirmation dialog. const bool kInstallSilently = false; const bool kEnableOnInstall = true; const bool kEnableIncognitoOnInstall = false; - extensions_service->AddPendingExtension( - id, update_url, kIsTheme, kInstallSilently, - kEnableOnInstall, kEnableIncognitoOnInstall); + extensions_service->AddPendingExtensionFromSync( + id, update_url, kExpectedCrxType, + kInstallSilently, kEnableOnInstall, kEnableIncognitoOnInstall); ExtensionUpdater* extension_updater = extensions_service->updater(); // Auto-updates should now be on always (see the construction of // the ExtensionsService in ProfileImpl::InitExtensions()). |