diff options
| author | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-02 01:29:59 +0000 |
|---|---|---|
| committer | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-02 01:29:59 +0000 |
| commit | fd64dece78e0ecae9dd17d8dedbc72fb3e5249b2 (patch) | |
| tree | 81f726857ea76f8b80aa13efb55e6bd5d1d01d70 /chrome/browser/automation/automation_provider_observers.cc | |
| parent | 899923cb46c1548e35ca747d6a68aeb3ec8ee201 (diff) | |
| download | chromium_src-fd64dece78e0ecae9dd17d8dedbc72fb3e5249b2.zip chromium_src-fd64dece78e0ecae9dd17d8dedbc72fb3e5249b2.tar.gz chromium_src-fd64dece78e0ecae9dd17d8dedbc72fb3e5249b2.tar.bz2 | |
Revert 95009. Causing pyauto NTP test failures on all platforms.
Original CL: - Show crashed apps on NTP, desaturated. Click to reload.
Also refactored CreateAppInfo a bit.
BUG=90433
TEST=Crash a packaged app with a background page. It appears on the NTP, and clicking its icon relaunches it.
Review URL: http://codereview.chromium.org/7517019
TBR=yoz@chromium.org
Review URL: http://codereview.chromium.org/7553001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95023 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation/automation_provider_observers.cc')
| -rw-r--r-- | chrome/browser/automation/automation_provider_observers.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc index dd0cc47..155af6c 100644 --- a/chrome/browser/automation/automation_provider_observers.cc +++ b/chrome/browser/automation/automation_provider_observers.cc @@ -1981,10 +1981,8 @@ std::vector<DictionaryValue*>* GetAppInfoFromExtensions( ext != extensions->end(); ++ext) { // Only return information about extensions that are actually apps. if ((*ext)->is_app()) { - DictionaryValue* app_info = - AppLauncherHandler::CreateAppInfo(*ext, NULL, ext_service); - if (!app_info) - continue; + DictionaryValue* app_info = new DictionaryValue(); + AppLauncherHandler::CreateAppInfo(*ext, NULL, ext_service, app_info); app_info->SetBoolean("is_component_extension", (*ext)->location() == Extension::COMPONENT); |