diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-22 21:21:48 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-22 21:21:48 +0000 |
| commit | c1e432a2610e72bdbd19b10b769ad6ca9ebfb2c6 (patch) | |
| tree | b0bef9070c27457389c7bbfe1205bd3f9c4b057d /chrome/browser/extensions/extensions_service.h | |
| parent | 27c0d1e50248e9073671f5422ecc3feac306ca12 (diff) | |
| download | chromium_src-c1e432a2610e72bdbd19b10b769ad6ca9ebfb2c6.zip chromium_src-c1e432a2610e72bdbd19b10b769ad6ca9ebfb2c6.tar.gz chromium_src-c1e432a2610e72bdbd19b10b769ad6ca9ebfb2c6.tar.bz2 | |
Nasty short-term hack to special case display of dialog
on theme installation. It should not be displayed if the
theme was installed from our gallery URL.
I intend to fix this very soon, but I wanted it to make
this coming build, so I did this quick thing for now.
Also, I found another bug in ExtensionsService install
logic. There was a test, it was ensuring the wrong
behavior :(.
Review URL: http://codereview.chromium.org/155936
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21321 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extensions_service.h')
| -rw-r--r-- | chrome/browser/extensions/extensions_service.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extensions_service.h b/chrome/browser/extensions/extensions_service.h index 87c0dc7..d63073c 100644 --- a/chrome/browser/extensions/extensions_service.h +++ b/chrome/browser/extensions/extensions_service.h @@ -121,6 +121,10 @@ class ExtensionsService // immediately loaded. void InstallExtension(const FilePath& extension_path); + // XXX Hack: This is a temporary nasty hack to get theme installation working + // without a dialog. Will be fixed by making ExtensionsService more modular. + void InstallExtension(const FilePath& extension_path, const GURL& url); + // Updates a currently-installed extension with the contents from // |extension_path|. The |alert_on_error| parameter controls whether the // user will be notified in the event of failure. If |callback| is non-null, @@ -296,7 +300,7 @@ class ExtensionsServiceBackend // Install the extension file at |extension_path|. Errors are reported through // ExtensionErrorReporter. OnExtensionInstalled is called in the frontend on // success. - void InstallExtension(const FilePath& extension_path, + void InstallExtension(const FilePath& extension_path, bool from_gallery, scoped_refptr<ExtensionsService> frontend); // Similar to InstallExtension, but |extension_path| must be an updated @@ -358,6 +362,7 @@ class ExtensionsServiceBackend // number is greater than the current installed version. If |silent| is true, // the confirmation dialog will not pop up. void InstallOrUpdateExtension(const FilePath& extension_path, + bool from_gallery, const std::string& expected_id, bool silent); // Validates the signature of the extension in |extension_path|. Returns true @@ -376,7 +381,8 @@ class ExtensionsServiceBackend const std::string expected_id, const DictionaryValue& manifest, const std::vector< Tuple2<SkBitmap, FilePath> >& images, - bool silent); + bool silent, + bool from_gallery); // Notify the frontend that there was an error loading an extension. void ReportExtensionLoadError(const FilePath& extension_path, |