ash/aura/wm_root_window_controller_aura.cc - Issue 2293183002: ash: Remove ash::Shelf in favor of ash::WmShelf

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/aura/wm_root_window_controller_aura.cc

Issue 2293183002: ash: Remove ash::Shelf in favor of ash::WmShelf (Closed)

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

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/aura/wm_root_window_controller_aura.h"	5 #include "ash/aura/wm_root_window_controller_aura.h"

6	6

7 #include "ash/aura/wm_shelf_aura.h"	7 #include "ash/aura/wm_shelf_aura.h"

8 #include "ash/aura/wm_shell_aura.h"	8 #include "ash/aura/wm_shell_aura.h"

9 #include "ash/aura/wm_window_aura.h"	9 #include "ash/aura/wm_window_aura.h"

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

11 #include "ash/common/shelf/shelf_widget.h"	10 #include "ash/common/shelf/shelf_widget.h"

12 #include "ash/common/wm_root_window_controller_observer.h"	11 #include "ash/common/wm_root_window_controller_observer.h"

13 #include "ash/display/window_tree_host_manager.h"	12 #include "ash/display/window_tree_host_manager.h"

14 #include "ash/root_window_controller.h"	13 #include "ash/root_window_controller.h"

15 #include "ash/shell.h"	14 #include "ash/shell.h"

16 #include "ui/aura/window.h"	15 #include "ui/aura/window.h"

17 #include "ui/aura/window_event_dispatcher.h"	16 #include "ui/aura/window_event_dispatcher.h"

18 #include "ui/aura/window_property.h"	17 #include "ui/aura/window_property.h"

19 #include "ui/aura/window_tree_host.h"	18 #include "ui/aura/window_tree_host.h"

20 #include "ui/display/screen.h"	19 #include "ui/display/screen.h"

(...skipping 111 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
132 const display::Display& display) {}	131 const display::Display& display) {}

133	132

134 void WmRootWindowControllerAura::OnDisplayMetricsChanged(	133 void WmRootWindowControllerAura::OnDisplayMetricsChanged(

135 const display::Display& display,	134 const display::Display& display,

136 uint32_t metrics) {	135 uint32_t metrics) {

137 FOR_EACH_OBSERVER(WmRootWindowControllerObserver, *observers(),	136 FOR_EACH_OBSERVER(WmRootWindowControllerObserver, *observers(),

138 OnWorkAreaChanged());	137 OnWorkAreaChanged());

139 }	138 }

140	139

141 } // namespace ash	140 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/ash.gyp ('k') | ash/common/accelerators/accelerator_controller.cc » ('j') | no next file with comments »