diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 07:53:34 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 07:53:34 +0000 |
| commit | 6b414c236a472dcae02bf9535d2bc71eb4f43ea4 (patch) | |
| tree | 39df96147053297ae822773a049e5c147e2013e6 /chrome/browser/autocomplete/extension_app_provider.cc | |
| parent | 8e4e567b488d22ec0aad82905df86b17845a0dc9 (diff) | |
| download | chromium_src-6b414c236a472dcae02bf9535d2bc71eb4f43ea4.zip chromium_src-6b414c236a472dcae02bf9535d2bc71eb4f43ea4.tar.gz chromium_src-6b414c236a472dcae02bf9535d2bc71eb4f43ea4.tar.bz2 | |
Move parsing of app.launch keys out of Extension.
Based on patch from Joe Thomas <MHX348@motorola.com>, https://chromiumcodereview.appspot.com/14241002/ .
BUG=159265
Review URL: https://chromiumcodereview.appspot.com/15806015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204198 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/extension_app_provider.cc')
| -rw-r--r-- | chrome/browser/autocomplete/extension_app_provider.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/autocomplete/extension_app_provider.cc b/chrome/browser/autocomplete/extension_app_provider.cc index 788d096..984358d 100644 --- a/chrome/browser/autocomplete/extension_app_provider.cc +++ b/chrome/browser/autocomplete/extension_app_provider.cc @@ -19,6 +19,7 @@ #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" +#include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "content/public/browser/notification_source.h" #include "ui/base/l10n/l10n_util.h" @@ -164,8 +165,8 @@ void ExtensionAppProvider::RefreshAppList() { !extension_service->CanLoadInIncognito(app)) continue; - GURL launch_url = - app->is_platform_app() ? app->url() : app->GetFullLaunchURL(); + GURL launch_url = app->is_platform_app() ? + app->url() : extensions::AppLaunchInfo::GetFullLaunchURL(app); DCHECK(launch_url.is_valid()); ExtensionApp extension_app = { |