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

Side by Side Diff: ash/wm/panels/panel_layout_manager.cc

Issue 2889413002: chromeos: nukes window_state_aura (Closed)
Patch Set: merge, remove include from windows and shuffle functions for declaration Created 3 years, 7 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/wm/panels/panel_layout_manager.h" 5 #include "ash/wm/panels/panel_layout_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <utility> 9 #include <utility>
10 10
11 #include "ash/keyboard/keyboard_observer_register.h" 11 #include "ash/keyboard/keyboard_observer_register.h"
12 #include "ash/public/cpp/shell_window_ids.h" 12 #include "ash/public/cpp/shell_window_ids.h"
13 #include "ash/public/cpp/window_properties.h" 13 #include "ash/public/cpp/window_properties.h"
14 #include "ash/root_window_controller.h" 14 #include "ash/root_window_controller.h"
15 #include "ash/shelf/wm_shelf.h" 15 #include "ash/shelf/wm_shelf.h"
16 #include "ash/shell.h" 16 #include "ash/shell.h"
17 #include "ash/shell_port.h" 17 #include "ash/shell_port.h"
18 #include "ash/wm/overview/window_selector_controller.h" 18 #include "ash/wm/overview/window_selector_controller.h"
19 #include "ash/wm/window_animation_types.h" 19 #include "ash/wm/window_animation_types.h"
20 #include "ash/wm/window_parenting_utils.h" 20 #include "ash/wm/window_parenting_utils.h"
21 #include "ash/wm/window_properties.h" 21 #include "ash/wm/window_properties.h"
22 #include "ash/wm/window_state.h" 22 #include "ash/wm/window_state.h"
23 #include "ash/wm/window_state_aura.h"
24 #include "ash/wm/window_util.h" 23 #include "ash/wm/window_util.h"
25 #include "ash/wm_window.h" 24 #include "ash/wm_window.h"
26 #include "base/auto_reset.h" 25 #include "base/auto_reset.h"
27 #include "third_party/skia/include/core/SkColor.h" 26 #include "third_party/skia/include/core/SkColor.h"
28 #include "third_party/skia/include/core/SkPath.h" 27 #include "third_party/skia/include/core/SkPath.h"
29 #include "ui/aura/client/window_parenting_client.h" 28 #include "ui/aura/client/window_parenting_client.h"
30 #include "ui/aura/window_delegate.h" 29 #include "ui/aura/window_delegate.h"
31 #include "ui/compositor/scoped_layer_animation_settings.h" 30 #include "ui/compositor/scoped_layer_animation_settings.h"
32 #include "ui/gfx/canvas.h" 31 #include "ui/gfx/canvas.h"
33 #include "ui/gfx/geometry/rect.h" 32 #include "ui/gfx/geometry/rect.h"
(...skipping 907 matching lines...) Expand 10 before | Expand all | Expand 10 after
941 // This bounds change will have caused a change to the Shelf which does not 940 // This bounds change will have caused a change to the Shelf which does not
942 // propogate automatically to this class, so manually recalculate bounds. 941 // propogate automatically to this class, so manually recalculate bounds.
943 OnWindowResized(); 942 OnWindowResized();
944 } 943 }
945 944
946 void PanelLayoutManager::OnKeyboardClosed() { 945 void PanelLayoutManager::OnKeyboardClosed() {
947 keyboard_observer_.RemoveAll(); 946 keyboard_observer_.RemoveAll();
948 } 947 }
949 948
950 } // namespace ash 949 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/overview/window_selector_unittest.cc ('k') | ash/wm/panels/panel_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698