chrome/browser/web_applications/web_app.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/web_applications/web_app.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/webui/options/content_settings_handler.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | chrome/common/extensions/app_launcher_info.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/web_applications/web_app.cc

diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc

index d0b01a23ce484ba568dc3b737a4f338b54cffe55..eddc41ac5e3e2c13a5a21a8716d38d3d7587aeda 100644

--- a/chrome/browser/web_applications/web_app.cc

+++ b/chrome/browser/web_applications/web_app.cc

@@ -12,6 +12,7 @@

#include "base/threading/thread.h"

#include "base/utf_string_conversions.h"

#include "chrome/common/chrome_constants.h"

+#include "chrome/common/extensions/app_launcher_info.h"

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

#include "chrome/common/url_constants.h"

#include "content/public/browser/browser_thread.h"

@@ -105,7 +106,9 @@ base::FilePath GetWebAppDataDirectory(const base::FilePath& profile_path,

base::FilePath GetWebAppDataDirectory(const base::FilePath& profile_path,

const extensions::Extension& extension) {

return GetWebAppDataDirectory(

- profile_path, extension.id(), GURL(extension.launch_web_url()));

+ profile_path,

+ extension.id(),

+ GURL(extensions::AppLauncherInfo::GetLaunchWebURL(&extension)));

}

std::string GenerateApplicationNameFromInfo(