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

Unified Diff: chrome/browser/ui/web_applications/web_app_ui.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
Index: chrome/browser/ui/web_applications/web_app_ui.cc
diff --git a/chrome/browser/ui/web_applications/web_app_ui.cc b/chrome/browser/ui/web_applications/web_app_ui.cc
index cfe3c0959f2b232bc5dfeeb0bab0d8d9f6a6b486..3d2422facf7a926abaeba7cca17b9db38354b8ec 100644
--- a/chrome/browser/ui/web_applications/web_app_ui.cc
+++ b/chrome/browser/ui/web_applications/web_app_ui.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/web_applications/web_app.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/extensions/api/icons/icons_handler.h"
+#include "chrome/common/extensions/app_launcher_info.h"
#include "chrome/common/extensions/extension.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_details.h"
@@ -388,7 +389,7 @@ void UpdateShortcutInfoForApp(const extensions::Extension& app,
ShellIntegration::ShortcutInfo* shortcut_info) {
shortcut_info->extension_id = app.id();
shortcut_info->is_platform_app = app.is_platform_app();
- shortcut_info->url = GURL(app.launch_web_url());
+ shortcut_info->url = GURL(extensions::AppLauncherInfo::GetLaunchWebURL(&app));
shortcut_info->title = UTF8ToUTF16(app.name());
shortcut_info->description = UTF8ToUTF16(app.description());
shortcut_info->extension_path = app.path();
« no previous file with comments | « chrome/browser/ui/tabs/tab_strip_model_unittest.cc ('k') | chrome/browser/ui/webui/extensions/extension_icon_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698