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

Side by Side Diff: ash/wm/lock_layout_manager.h

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 4 years, 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_WM_LOCK_LAYOUT_MANAGER_H_ 5 #ifndef ASH_WM_LOCK_LAYOUT_MANAGER_H_
6 #define ASH_WM_LOCK_LAYOUT_MANAGER_H_ 6 #define ASH_WM_LOCK_LAYOUT_MANAGER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/shell_delegate.h"
9 #include "ash/common/wm/wm_types.h" 10 #include "ash/common/wm/wm_types.h"
10 #include "ash/shell_delegate.h"
11 #include "ash/snap_to_pixel_layout_manager.h" 11 #include "ash/snap_to_pixel_layout_manager.h"
12 #include "base/compiler_specific.h"
13 #include "base/macros.h" 12 #include "base/macros.h"
14 #include "ui/aura/layout_manager.h" 13 #include "ui/aura/layout_manager.h"
15 #include "ui/aura/window_observer.h" 14 #include "ui/aura/window_observer.h"
16 #include "ui/gfx/geometry/rect.h" 15 #include "ui/gfx/geometry/rect.h"
17 #include "ui/keyboard/keyboard_controller.h" 16 #include "ui/keyboard/keyboard_controller.h"
18 #include "ui/keyboard/keyboard_controller_observer.h" 17 #include "ui/keyboard/keyboard_controller_observer.h"
19 18
20 namespace aura { 19 namespace aura {
21 class RootWindow; 20 class RootWindow;
22 class Window; 21 class Window;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 92
94 // The bounds of the keyboard. 93 // The bounds of the keyboard.
95 gfx::Rect keyboard_bounds_; 94 gfx::Rect keyboard_bounds_;
96 95
97 DISALLOW_COPY_AND_ASSIGN(LockLayoutManager); 96 DISALLOW_COPY_AND_ASSIGN(LockLayoutManager);
98 }; 97 };
99 98
100 } // namespace ash 99 } // namespace ash
101 100
102 #endif // ASH_WM_LOCK_LAYOUT_MANAGER_H_ 101 #endif // ASH_WM_LOCK_LAYOUT_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698