ash/shell/window_watcher.cc - Issue 2518423003: Combine shelf platform and windowed app types.

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/shell/window_watcher.cc

Issue 2518423003: Combine shelf platform and windowed app types. (Closed)

Patch Set: Fix kInvalidShelfID typo. Created 4 years, 1 month 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/shell/window_watcher.cc

diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc

index 311e47a589b48ce6b69450d4d11afe2519327020..1ca47e11ba2cd39218b4bdda94586df518727878 100644

--- a/ash/shell/window_watcher.cc

+++ b/ash/shell/window_watcher.cc

@@ -100,7 +100,7 @@ void WindowWatcher::OnWindowAdded(aura::Window* new_window) {

ShelfItem item;

item.type = new_window->type() == ui::wm::WINDOW_TYPE_PANEL

? ash::TYPE_APP_PANEL

- : ash::TYPE_PLATFORM_APP;

+ : ash::TYPE_APP;

ash::ShelfID id = model->next_id();

id_to_window_[id] = new_window;