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

Side by Side Diff: ash/common/shelf/wm_shelf.h

Issue 2166043003: mash: Migrate ShelfLockingManager to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move ShelfLockingManager test access to Shelf. 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_COMMON_SHELF_WM_SHELF_H_ 5 #ifndef ASH_COMMON_SHELF_WM_SHELF_H_
6 #define ASH_COMMON_SHELF_WM_SHELF_H_ 6 #define ASH_COMMON_SHELF_WM_SHELF_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/shelf/shelf_types.h" 9 #include "ash/common/shelf/shelf_types.h"
10 10
11 namespace gfx { 11 namespace gfx {
12 class Rect; 12 class Rect;
13 } 13 }
14 14
15 namespace ui { 15 namespace ui {
16 class GestureEvent; 16 class GestureEvent;
17 class MouseEvent; 17 class MouseEvent;
18 } 18 }
19 19
20 namespace ash { 20 namespace ash {
21 21
22 class ShelfLockingManager;
22 class WmShelfObserver; 23 class WmShelfObserver;
23 class WmWindow; 24 class WmWindow;
24 25
25 // Used for accessing global state. 26 // Used for accessing global state.
26 class ASH_EXPORT WmShelf { 27 class ASH_EXPORT WmShelf {
27 public: 28 public:
28 // Returns the window showing the shelf. 29 // Returns the window showing the shelf.
29 virtual WmWindow* GetWindow() = 0; 30 virtual WmWindow* GetWindow() = 0;
30 31
31 virtual ShelfAlignment GetAlignment() const = 0; 32 virtual ShelfAlignment GetAlignment() const = 0;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 // TODO(jamescook): Nuke when ash_sysui is removed. http://crbug.com/621112 85 // TODO(jamescook): Nuke when ash_sysui is removed. http://crbug.com/621112
85 virtual void UpdateAutoHideForMouseEvent(ui::MouseEvent* event) = 0; 86 virtual void UpdateAutoHideForMouseEvent(ui::MouseEvent* event) = 0;
86 virtual void UpdateAutoHideForGestureEvent(ui::GestureEvent* event) = 0; 87 virtual void UpdateAutoHideForGestureEvent(ui::GestureEvent* event) = 0;
87 88
88 virtual void AddObserver(WmShelfObserver* observer) = 0; 89 virtual void AddObserver(WmShelfObserver* observer) = 0;
89 virtual void RemoveObserver(WmShelfObserver* observer) = 0; 90 virtual void RemoveObserver(WmShelfObserver* observer) = 0;
90 91
91 // Simulates a virtual keyboard bounds update. 92 // Simulates a virtual keyboard bounds update.
92 virtual void SetKeyboardBoundsForTesting(const gfx::Rect& bounds) = 0; 93 virtual void SetKeyboardBoundsForTesting(const gfx::Rect& bounds) = 0;
93 94
95 virtual ShelfLockingManager* GetShelfLockingManagerForTesting() = 0;
96
94 protected: 97 protected:
95 virtual ~WmShelf() {} 98 virtual ~WmShelf() {}
96 }; 99 };
97 100
98 } // namespace ash 101 } // namespace ash
99 102
100 #endif // ASH_COMMON_SHELF_WM_SHELF_H_ 103 #endif // ASH_COMMON_SHELF_WM_SHELF_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698