chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc - Issue 22887015: Remove PerBrowser launcher

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 22887015: Remove PerBrowser launcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebased Created 7 years, 4 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/about_flags.cc ('k') | chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc » ('j') | chrome/browser/ui/ash/launcher/browser_launcher_item_controller.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 7cf45541a7072816ac7a37d7b507fb386c547ab3..277c57376000cb1a0e597120e83fa4ad80d161a5 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

@@ -265,8 +265,8 @@ bool AppShortcutLauncherItemController::WebContentMatchesApp(

refocus_pattern.MatchesURL(tab_url)) ||

(extension->OverlapsWithOrigin(tab_url) &&

extension->web_extent().MatchesURL(tab_url)) ||

- launcher_controller()->GetPerAppInterface()->

- IsWebContentHandledByApplication(web_contents, app_id()));

+ app_controller_->IsWebContentHandledByApplication(web_contents,

+ app_id()));

}

void AppShortcutLauncherItemController::ActivateContent(