chrome/browser/ui/webui/extensions/extension_icon_source.cc - Issue 12316077: Move the parsing of app.launch related keys out of Extension class.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/extensions/extension_icon_source.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: Rebase + review comments addressed Created 7 years, 10 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

« chrome/browser/extensions/convert_web_app_unittest.cc ('K') | « chrome/browser/ui/web_applications/web_app_ui.cc ('k') | chrome/browser/ui/webui/ntp/app_launcher_handler.cc » ('j') | chrome/common/extensions/app_launcher_info.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/extensions/extension_icon_source.cc

diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc

index 4e5c1466d3866dcdc901e02b38abf0e836751563..924b484d1b15d865a1cc06995c517eb2543caab6 100644

--- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc

+++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc

@@ -20,6 +20,7 @@

#include "chrome/browser/favicon/favicon_service_factory.h"

#include "chrome/browser/profiles/profile.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 "chrome/common/extensions/extension_constants.h"

#include "chrome/common/extensions/extension_resource.h"

@@ -216,7 +217,8 @@ void ExtensionIconSource::LoadFaviconImage(int request_id) {

return;

}

- GURL favicon_url = GetData(request_id)->extension->GetFullLaunchURL();

+ GURL favicon_url = extensions::AppLauncherInfo::GetFullLaunchURL(

+ GetData(request_id)->extension);

favicon_service->GetRawFaviconForURL(

FaviconService::FaviconForURLParams(

profile_, favicon_url, history::FAVICON, gfx::kFaviconSize),