chrome/browser/ui/tabs/pinned_tab_codec.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/tabs/pinned_tab_codec.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/extensions/application_launch.cc ('k') | chrome/browser/ui/tabs/tab_strip_model_unittest.cc » ('j') | chrome/common/extensions/app_launcher_info.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/tabs/pinned_tab_codec.cc

diff --git a/chrome/browser/ui/tabs/pinned_tab_codec.cc b/chrome/browser/ui/tabs/pinned_tab_codec.cc

index 2c406fc3eefe36080db500778814a6b3b807267c..a49e626fbf1bfff3d7845f6aa10454feefeae120 100644

--- a/chrome/browser/ui/tabs/pinned_tab_codec.cc

+++ b/chrome/browser/ui/tabs/pinned_tab_codec.cc

@@ -14,6 +14,7 @@

#include "chrome/browser/ui/browser_iterator.h"

#include "chrome/browser/ui/browser_list.h"

#include "chrome/browser/ui/tabs/tab_strip_model.h"

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

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

#include "chrome/common/pref_names.h"

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

@@ -62,7 +63,8 @@ static void EncodePinnedTab(TabStripModel* model,

// For apps we use the launch url. We do this because the user is

// effectively restarting the app, so returning them to the app's launch

// page seems closest to what they expect.

- value->SetString(kURL, extension->GetFullLaunchURL().spec());

+ value->SetString(

+ kURL, extensions::AppLauncherInfo::GetFullLaunchURL(extension).spec());

values->Append(value.release());

} else {

NavigationEntry* entry = web_contents->GetController().GetActiveEntry();