chrome/browser/ui/ash/launcher/extension_app_window_launcher_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/extension_app_window_launcher_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/chrome_launcher_controller_impl_unittest.cc ('k') | chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 2fbcc388df3b94cdd7eb559bfa808ef0e05a60cd..7aac24658ca3f8ecb754ffcd266be4b732b7afdd 100644

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

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

@@ -5,8 +5,8 @@

#include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h"

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

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

#include "ash/common/wm_window.h"

+#include "ash/shell.h"

#include "ash/wm/window_properties.h"

#include "ash/wm/window_util.h"

#include "base/stl_util.h"

@@ -173,7 +173,7 @@ void ExtensionAppWindowLauncherController::RegisterApp(AppWindow* app_window) {

// If there is already a shelf id mapped to this AppLaunchId (e.g. pinned),

// use that shelf item.

shelf_id =

- ash::WmShell::Get()->shelf_delegate()->GetShelfIDForAppIDAndLaunchID(

+ ash::Shell::Get()->shelf_delegate()->GetShelfIDForAppIDAndLaunchID(

app_id, launch_id);

if (shelf_id == 0) {