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

Side by Side Diff: ash/wm/dock/docked_window_layout_manager.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/dock/docked_window_layout_manager.h" 5 #include "ash/wm/dock/docked_window_layout_manager.h"
6 6
7 #include "ash/animation/animation_change_type.h" 7 #include "ash/animation/animation_change_type.h"
8 #include "ash/common/wm_shell.h"
9 #include "ash/common/wm_window.h"
8 #include "ash/public/cpp/shell_window_ids.h" 10 #include "ash/public/cpp/shell_window_ids.h"
9 #include "ash/resources/grit/ash_resources.h" 11 #include "ash/resources/grit/ash_resources.h"
10 #include "ash/root_window_controller.h" 12 #include "ash/root_window_controller.h"
11 #include "ash/shelf/shelf_background_animator.h" 13 #include "ash/shelf/shelf_background_animator.h"
12 #include "ash/shelf/shelf_background_animator_observer.h" 14 #include "ash/shelf/shelf_background_animator_observer.h"
13 #include "ash/shelf/shelf_constants.h" 15 #include "ash/shelf/shelf_constants.h"
14 #include "ash/shelf/wm_shelf.h" 16 #include "ash/shelf/wm_shelf.h"
15 #include "ash/shelf/wm_shelf_observer.h" 17 #include "ash/shelf/wm_shelf_observer.h"
16 #include "ash/wm/overview/window_selector_controller.h" 18 #include "ash/wm/overview/window_selector_controller.h"
17 #include "ash/wm/window_animation_types.h" 19 #include "ash/wm/window_animation_types.h"
18 #include "ash/wm/window_parenting_utils.h" 20 #include "ash/wm/window_parenting_utils.h"
19 #include "ash/wm/window_resizer.h" 21 #include "ash/wm/window_resizer.h"
20 #include "ash/wm/window_state.h" 22 #include "ash/wm/window_state.h"
21 #include "ash/wm/window_state_aura.h" 23 #include "ash/wm/window_state_aura.h"
22 #include "ash/wm_shell.h"
23 #include "ash/wm_window.h"
24 #include "base/auto_reset.h" 24 #include "base/auto_reset.h"
25 #include "base/metrics/histogram_macros.h" 25 #include "base/metrics/histogram_macros.h"
26 #include "third_party/skia/include/core/SkColor.h" 26 #include "third_party/skia/include/core/SkColor.h"
27 #include "ui/base/resource/resource_bundle.h" 27 #include "ui/base/resource/resource_bundle.h"
28 #include "ui/compositor/scoped_layer_animation_settings.h" 28 #include "ui/compositor/scoped_layer_animation_settings.h"
29 #include "ui/display/display.h" 29 #include "ui/display/display.h"
30 #include "ui/display/screen.h" 30 #include "ui/display/screen.h"
31 #include "ui/views/background.h" 31 #include "ui/views/background.h"
32 #include "ui/wm/core/coordinate_conversion.h" 32 #include "ui/wm/core/coordinate_conversion.h"
33 #include "ui/wm/core/window_animations.h" 33 #include "ui/wm/core/window_animations.h"
(...skipping 1293 matching lines...) Expand 10 before | Expand all | Expand 10 after
1327 const gfx::Rect& keyboard_bounds) { 1327 const gfx::Rect& keyboard_bounds) {
1328 // This bounds change will have caused a change to the Shelf which does not 1328 // This bounds change will have caused a change to the Shelf which does not
1329 // propagate automatically to this class, so manually recalculate bounds. 1329 // propagate automatically to this class, so manually recalculate bounds.
1330 Relayout(); 1330 Relayout();
1331 UpdateDockBounds(DockedWindowLayoutManagerObserver::KEYBOARD_BOUNDS_CHANGING); 1331 UpdateDockBounds(DockedWindowLayoutManagerObserver::KEYBOARD_BOUNDS_CHANGING);
1332 } 1332 }
1333 1333
1334 void DockedWindowLayoutManager::OnKeyboardClosed() {} 1334 void DockedWindowLayoutManager::OnKeyboardClosed() {}
1335 1335
1336 } // namespace ash 1336 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/dock/docked_window_layout_manager.h ('k') | ash/wm/dock/docked_window_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698