Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1105)

Unified Diff: chrome/browser/autocomplete/extension_app_provider.cc

Issue 12316077: Move the parsing of app.launch related keys out of Extension class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autocomplete/extension_app_provider.cc
diff --git a/chrome/browser/autocomplete/extension_app_provider.cc b/chrome/browser/autocomplete/extension_app_provider.cc
index 2e16e646f350ad28214eabfa6e185524c83b157f..5febcc9a46a90741476706cc4807dc2da1ce425b 100644
--- a/chrome/browser/autocomplete/extension_app_provider.cc
+++ b/chrome/browser/autocomplete/extension_app_provider.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/ui/extensions/application_launch.h"
#include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
#include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/extensions/app_launcher_info.h"
#include "chrome/common/extensions/extension.h"
#include "content/public/browser/notification_source.h"
#include "ui/base/l10n/l10n_util.h"
@@ -162,8 +163,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::AppLauncherInfo::GetFullLaunchURL(app);
DCHECK(launch_url.is_valid());
ExtensionApp extension_app = {
« no previous file with comments | « no previous file | chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698