Chromium Code Reviews| Index: chrome/browser/extensions/extension_service.cc |
| diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc |
| index 06290c7fec70c6fc23c8e5797a9c8c6182e69443..f8e70caeb7fd8c34d5df6e98d71ffdd1d491f5e7 100644 |
| --- a/chrome/browser/extensions/extension_service.cc |
| +++ b/chrome/browser/extensions/extension_service.cc |
| @@ -378,14 +378,22 @@ bool ExtensionService::IsDownloadFromMiniGallery(const GURL& download_url) { |
| false); // case_sensitive |
| } |
| -bool ExtensionService::IsInstalledApp(const GURL& url) { |
| +const Extension* ExtensionService::GetInstalledApp(const GURL& url) { |
| // Check for hosted app. |
| - if (GetExtensionByWebExtent(url) != NULL) |
| - return true; |
| + const Extension* app = GetExtensionByWebExtent(url); |
| + if (app != NULL) |
|
Matt Perry
2011/01/26 20:09:23
nit: chrome style is to drop the "!= NULL"
Charlie Reis
2011/03/01 21:33:11
Done.
|
| + return app; |
| // Check for packaged app. |
| - const Extension* extension = GetExtensionByURL(url); |
| - return extension != NULL && extension->is_app(); |
| + app = GetExtensionByURL(url); |
| + if (app != NULL && app->is_app()) |
| + return app; |
| + |
| + return NULL; |
| +} |
| + |
| +bool ExtensionService::IsInstalledApp(const GURL& url) { |
| + return GetInstalledApp(url) != NULL; |
| } |
| // static |