ash/common/shelf/shelf_window_watcher.cc - Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container

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: ash/common/shelf/shelf_window_watcher.cc

Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container (Closed)

Patch Set: rebase Created 4 years, 2 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:

Index: ash/common/shelf/shelf_window_watcher.cc

diff --git a/ash/common/shelf/shelf_window_watcher.cc b/ash/common/shelf/shelf_window_watcher.cc

index 7bf48735e76b8c815cda7d7ad412093da435c53c..22a6e7f7fd86e2605c68e3955c04eec728704a3f 100644

--- a/ash/common/shelf/shelf_window_watcher.cc

+++ b/ash/common/shelf/shelf_window_watcher.cc

@@ -10,11 +10,11 @@

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

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

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

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

#include "ash/common/wm/window_state.h"

#include "ash/common/wm_shell.h"

#include "ash/common/wm_window.h"

#include "ash/common/wm_window_property.h"

+#include "ash/public/cpp/shell_window_ids.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/display/display.h"

#include "ui/display/screen.h"