chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc - Issue 2177663002: mash: Move ownership of ShelfDelegate to WmShell

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 2177663002: mash: Move ownership of ShelfDelegate to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix wallpaper tests again Created 4 years, 5 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.h ('k') | chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.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 e043c80d73546a1fb71c888c8a5a3d144089003a..eba8e08d10b8dbf54c1b839830cd7c97f2279284 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

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

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

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

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

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

#include "ash/shelf/shelf_util.h"

-#include "ash/shell.h"

#include "ash/wm/window_util.h"

#include "base/stl_util.h"

#include "base/strings/stringprintf.h"

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

} else if (app_shelf_id == app_id) {

// show_in_shelf in false and not a panel

shelf_id =

- ash::Shell::GetInstance()->GetShelfDelegate()->GetShelfIDForAppID(

- app_id);

+ ash::WmShell::Get()->shelf_delegate()->GetShelfIDForAppID(app_id);

// Check if the shelf_id corresponds to an already opened

// showInShelf=true window that has the same app_id. The current

// showInShelf=false window should not fold under this shelf item,