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

Side by Side Diff: ash/shelf/shelf_layout_manager.h

Issue 1921353002: Moves handful of files to ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shell_ids
Patch Set: merge to trunk Created 4 years, 8 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/shelf/background_animator.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 5 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
11 #include "ash/ash_export.h" 11 #include "ash/ash_export.h"
12 #include "ash/session/session_state_observer.h" 12 #include "ash/session/session_state_observer.h"
13 #include "ash/shelf/background_animator.h"
14 #include "ash/shelf/shelf.h" 13 #include "ash/shelf/shelf.h"
15 #include "ash/shelf/shelf_types.h" 14 #include "ash/shelf/shelf_types.h"
16 #include "ash/shell_observer.h" 15 #include "ash/shell_observer.h"
17 #include "ash/snap_to_pixel_layout_manager.h" 16 #include "ash/snap_to_pixel_layout_manager.h"
18 #include "ash/system/status_area_widget.h" 17 #include "ash/system/status_area_widget.h"
18 #include "ash/wm/common/background_animator.h"
19 #include "ash/wm/common/dock/docked_window_layout_manager_observer.h"
19 #include "ash/wm/common/workspace/workspace_types.h" 20 #include "ash/wm/common/workspace/workspace_types.h"
20 #include "ash/wm/dock/docked_window_layout_manager_observer.h"
21 #include "ash/wm/lock_state_observer.h" 21 #include "ash/wm/lock_state_observer.h"
22 #include "base/compiler_specific.h" 22 #include "base/compiler_specific.h"
23 #include "base/gtest_prod_util.h" 23 #include "base/gtest_prod_util.h"
24 #include "base/logging.h" 24 #include "base/logging.h"
25 #include "base/macros.h" 25 #include "base/macros.h"
26 #include "base/observer_list.h" 26 #include "base/observer_list.h"
27 #include "base/timer/timer.h" 27 #include "base/timer/timer.h"
28 #include "ui/gfx/geometry/insets.h" 28 #include "ui/gfx/geometry/insets.h"
29 #include "ui/gfx/geometry/rect.h" 29 #include "ui/gfx/geometry/rect.h"
30 #include "ui/keyboard/keyboard_controller.h" 30 #include "ui/keyboard/keyboard_controller.h"
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 397
398 // The show hide animation duration override or 0 for default. 398 // The show hide animation duration override or 0 for default.
399 int duration_override_in_ms_; 399 int duration_override_in_ms_;
400 400
401 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 401 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
402 }; 402 };
403 403
404 } // namespace ash 404 } // namespace ash
405 405
406 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 406 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/shelf/background_animator.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698