Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1614)

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: review comments 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
OLDNEW
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/workspace/workspace_layout_manager_backdrop_delegate.h" 11 #include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
13 #include "ash/common/wm/workspace_controller.h" 12 #include "ash/common/wm/workspace_controller.h"
14 #include "ash/common/wm_root_window_controller_observer.h" 13 #include "ash/common/wm_root_window_controller_observer.h"
15 #include "ash/display/window_tree_host_manager.h" 14 #include "ash/display/window_tree_host_manager.h"
16 #include "ash/root_window_controller.h" 15 #include "ash/root_window_controller.h"
17 #include "ash/shell.h" 16 #include "ash/shell.h"
18 #include "ui/aura/window.h" 17 #include "ui/aura/window.h"
19 #include "ui/aura/window_event_dispatcher.h" 18 #include "ui/aura/window_event_dispatcher.h"
20 #include "ui/aura/window_property.h" 19 #include "ui/aura/window_property.h"
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 void WmRootWindowControllerAura::OnDisplayRemoved( 152 void WmRootWindowControllerAura::OnDisplayRemoved(
154 const display::Display& display) {} 153 const display::Display& display) {}
155 154
156 void WmRootWindowControllerAura::OnDisplayMetricsChanged( 155 void WmRootWindowControllerAura::OnDisplayMetricsChanged(
157 const display::Display& display, 156 const display::Display& display,
158 uint32_t metrics) { 157 uint32_t metrics) {
159 FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_, 158 FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_,
160 OnWorkAreaChanged()); 159 OnWorkAreaChanged());
161 } 160 }
162 161
163 } // namespace ash 162 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698