chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc - Issue 2761373002: Move yet more from WmShell to Shell

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/browser_shortcut_launcher_item_controller.cc

Issue 2761373002: Move yet more from WmShell to Shell (Closed)

Patch Set: merge Created 3 years, 9 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/ui/ash/launcher/arc_app_launcher_browsertest.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index dd36cdf7636f2540f18621551ce17f83fb87b438..810a42a37de4174f582a99b28d97ea04aec2b11c 100644

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

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

@@ -9,9 +9,9 @@

#include "ash/common/shelf/shelf_delegate.h"

#include "ash/common/shelf/shelf_model.h"

-#include "ash/common/wm_shell.h"

#include "ash/common/wm_window.h"

#include "ash/resources/grit/ash_resources.h"

+#include "ash/shell.h"

#include "ash/wm/window_properties.h"

#include "ash/wm/window_util.h"

#include "base/memory/ptr_util.h"

@@ -358,7 +358,7 @@ bool BrowserShortcutLauncherItemController::IsBrowserRepresentedInBrowserList(

return false;

// v1 App popup windows with a valid app id have their own icon.

- ash::ShelfDelegate* delegate = ash::WmShell::Get()->shelf_delegate();

+ ash::ShelfDelegate* delegate = ash::Shell::Get()->shelf_delegate();

if (browser->is_app() && browser->is_type_popup() && delegate &&

delegate->GetShelfIDForAppID(web_app::GetExtensionIdFromApplicationName(

browser->app_name())) > 0) {