chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.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/app_shortcut_launcher_item_controller.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: 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

« no previous file with comments | « chrome/browser/profiles/profile_dependency_manager.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc » ('j') | chrome/browser/ui/tabs/tab_strip_model_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 2ce5659ad9855e26dda66defd069d49ab0d1510b..7f02b043bb5b34dc394a48236e000db78410d308 100644

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

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

@@ -18,6 +18,7 @@

#include "chrome/browser/ui/extensions/native_app_window.h"

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

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

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

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

using extensions::Extension;

@@ -34,9 +35,11 @@ AppShortcutLauncherItemController::AppShortcutLauncherItemController(

// used URL. This will also work with applications like Google Drive.

const Extension* extension =

launcher_controller()->GetExtensionForAppID(app_id);

- // Some unit tests have no real extension and will set their

- if (extension)

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

+ // Some unit tests have no real extension.

+ if (extension) {

+ refocus_url_ =

+ GURL(extensions::AppLaunchInfo::GetLaunchWebUrl(extension) + "*");

+ }

}

AppShortcutLauncherItemController::~AppShortcutLauncherItemController() {