chrome/browser/extensions/tab_helper.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/extensions/tab_helper.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/extensions/extension_service_unittest.cc ('k') | chrome/browser/profiles/profile_dependency_manager.cc » ('j') | chrome/common/extensions/app_launcher_info.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/tab_helper.cc

diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc

index d992b939ee3371a380253147bd0227e0f15d0741..4d10ca5e0fa483d2751029b161c01e71d78f7b73 100644

--- a/chrome/browser/extensions/tab_helper.cc

+++ b/chrome/browser/extensions/tab_helper.cc

@@ -28,6 +28,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 "chrome/common/extensions/extension_constants.h"

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

@@ -157,7 +158,7 @@ bool TabHelper::CanCreateApplicationShortcuts() const {

}

void TabHelper::SetExtensionApp(const Extension* extension) {

- DCHECK(!extension || extension->GetFullLaunchURL().is_valid());

+ DCHECK(!extension || AppLauncherInfo::GetFullLaunchURL(extension).is_valid());

extension_app_ = extension;

UpdateExtensionAppIcon(extension_app_);