ash/mus/bridge/wm_root_window_controller_mus.cc - Issue 2626483002: Removes WmShelfAura and WmShelfMus

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: ash/mus/bridge/wm_root_window_controller_mus.cc

Issue 2626483002: Removes WmShelfAura and WmShelfMus (Closed)

Patch Set: merge Created 3 years, 11 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 unified diff | Download patch

« no previous file with comments | « ash/mus/BUILD.gn ('k') | ash/mus/bridge/wm_shelf_mus.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ash/mus/bridge/wm_root_window_controller_mus.h"	5 #include "ash/mus/bridge/wm_root_window_controller_mus.h"

6	6

7 #include "ash/mus/bridge/wm_shelf_mus.h"	7 #include "ash/common/shelf/wm_shelf.h"

8 #include "ash/mus/bridge/wm_shell_mus.h"	8 #include "ash/mus/bridge/wm_shell_mus.h"

9 #include "ash/mus/bridge/wm_window_mus.h"	9 #include "ash/mus/bridge/wm_window_mus.h"

10 #include "ash/mus/root_window_controller.h"	10 #include "ash/mus/root_window_controller.h"

11 #include "ash/mus/window_manager.h"	11 #include "ash/mus/window_manager.h"

12 #include "ui/aura/mus/window_mus.h"	12 #include "ui/aura/mus/window_mus.h"

13 #include "ui/aura/mus/window_tree_client.h"	13 #include "ui/aura/mus/window_tree_client.h"

14 #include "ui/aura/window.h"	14 #include "ui/aura/window.h"

15 #include "ui/aura/window_property.h"	15 #include "ui/aura/window_property.h"

16 #include "ui/display/display.h"	16 #include "ui/display/display.h"

17 #include "ui/views/widget/widget.h"	17 #include "ui/views/widget/widget.h"

(...skipping 98 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
116 aura::WindowTreeClient* window_tree_client =	116 aura::WindowTreeClient* window_tree_client =

117 root_window_controller_->window_manager()->window_tree_client();	117 root_window_controller_->window_manager()->window_tree_client();

118 aura::Window* aura_window = WmWindowMus::GetAuraWindow(window);	118 aura::Window* aura_window = WmWindowMus::GetAuraWindow(window);

119 aura::WindowMus* window_mus = aura::WindowMus::Get(aura_window);	119 aura::WindowMus* window_mus = aura::WindowMus::Get(aura_window);

120 return window_tree_client->WasCreatedByThisClient(window_mus) \|\|	120 return window_tree_client->WasCreatedByThisClient(window_mus) \|\|

121 window_tree_client->IsRoot(window_mus);	121 window_tree_client->IsRoot(window_mus);

122 }	122 }

123	123

124 } // namespace mus	124 } // namespace mus

125 } // namespace ash	125 } // namespace ash

OLD	NEW