chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.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/ash/launcher/chrome_launcher_controller_per_browser.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/ash/launcher/app_shortcut_launcher_item_controller.cc ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | chrome/common/extensions/app_launcher_info.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc

index 49eee2a282cfe05c6d208b6b208772e285e6ee66..8f7060d0f1b47dbbcffeac42066603c96a474ce1 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc

@@ -42,6 +42,7 @@

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.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_resource.h"

#include "chrome/common/pref_names.h"

@@ -73,7 +74,8 @@ class AppShortcutLauncherItemController : public LauncherItemController {

if (app_id == "apdfllckaahabafndbhieahigkjlhalf") {

const Extension* extension =

launcher_controller()->GetExtensionForAppID(app_id);

- refocus_url_ = GURL(extension->launch_web_url() + "*");

+ refocus_url_ =

+ GURL(extensions::AppLauncherInfo::GetLaunchWebURL(extension) + "*");

}