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

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

Issue 2729363002: 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
« no previous file with comments | « ash/shelf/shelf_controller.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 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
11 #include "ash/common/session/session_state_observer.h"
12 #include "ash/common/shell_observer.h"
13 #include "ash/common/wm_activation_observer.h"
14 #include "ash/public/cpp/shelf_types.h" 11 #include "ash/public/cpp/shelf_types.h"
12 #include "ash/session/session_state_observer.h"
15 #include "ash/shelf/wm_shelf.h" 13 #include "ash/shelf/wm_shelf.h"
14 #include "ash/shell_observer.h"
16 #include "ash/wm/dock/docked_window_layout_manager_observer.h" 15 #include "ash/wm/dock/docked_window_layout_manager_observer.h"
17 #include "ash/wm/lock_state_observer.h" 16 #include "ash/wm/lock_state_observer.h"
18 #include "ash/wm/wm_snap_to_pixel_layout_manager.h" 17 #include "ash/wm/wm_snap_to_pixel_layout_manager.h"
19 #include "ash/wm/workspace/workspace_types.h" 18 #include "ash/wm/workspace/workspace_types.h"
19 #include "ash/wm_activation_observer.h"
20 #include "base/macros.h" 20 #include "base/macros.h"
21 #include "base/observer_list.h" 21 #include "base/observer_list.h"
22 #include "base/timer/timer.h" 22 #include "base/timer/timer.h"
23 #include "ui/gfx/geometry/insets.h" 23 #include "ui/gfx/geometry/insets.h"
24 #include "ui/gfx/geometry/rect.h" 24 #include "ui/gfx/geometry/rect.h"
25 #include "ui/keyboard/keyboard_controller_observer.h" 25 #include "ui/keyboard/keyboard_controller_observer.h"
26 26
27 namespace ui { 27 namespace ui {
28 class ImplicitAnimationObserver; 28 class ImplicitAnimationObserver;
29 class MouseEvent; 29 class MouseEvent;
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 // The current shelf background. Should not be assigned to directly, use 356 // The current shelf background. Should not be assigned to directly, use
357 // MaybeUpdateShelfBackground() instead. 357 // MaybeUpdateShelfBackground() instead.
358 ShelfBackgroundType shelf_background_type_; 358 ShelfBackgroundType shelf_background_type_;
359 359
360 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 360 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
361 }; 361 };
362 362
363 } // namespace ash 363 } // namespace ash
364 364
365 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 365 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_controller.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698