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

Side by Side Diff: ash/aura/wm_shelf_aura.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_AURA_WM_SHELF_AURA_H_ 5 #ifndef ASH_AURA_WM_SHELF_AURA_H_
6 #define ASH_AURA_WM_SHELF_AURA_H_ 6 #define ASH_AURA_WM_SHELF_AURA_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/shelf/wm_shelf.h" 9 #include "ash/common/shelf/wm_shelf.h"
10 #include "ash/shelf/shelf_icon_observer.h" 10 #include "ash/shelf/shelf_icon_observer.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 gfx::Rect GetUserWorkAreaBounds() const override; 57 gfx::Rect GetUserWorkAreaBounds() const override;
58 void UpdateIconPositionForWindow(WmWindow* window) override; 58 void UpdateIconPositionForWindow(WmWindow* window) override;
59 gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override; 59 gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override;
60 bool ProcessGestureEvent(const ui::GestureEvent& event, 60 bool ProcessGestureEvent(const ui::GestureEvent& event,
61 WmWindow* target_window) override; 61 WmWindow* target_window) override;
62 void UpdateAutoHideForMouseEvent(ui::MouseEvent* event) override; 62 void UpdateAutoHideForMouseEvent(ui::MouseEvent* event) override;
63 void UpdateAutoHideForGestureEvent(ui::GestureEvent* event) override; 63 void UpdateAutoHideForGestureEvent(ui::GestureEvent* event) override;
64 void AddObserver(WmShelfObserver* observer) override; 64 void AddObserver(WmShelfObserver* observer) override;
65 void RemoveObserver(WmShelfObserver* observer) override; 65 void RemoveObserver(WmShelfObserver* observer) override;
66 void SetKeyboardBoundsForTesting(const gfx::Rect& bounds) override; 66 void SetKeyboardBoundsForTesting(const gfx::Rect& bounds) override;
67 ShelfLockingManager* GetShelfLockingManagerForTesting() override;
67 68
68 // ShelfLayoutManagerObserver: 69 // ShelfLayoutManagerObserver:
69 void WillDeleteShelfLayoutManager() override; 70 void WillDeleteShelfLayoutManager() override;
70 void OnAutoHideStateChanged(ShelfAutoHideState new_state) override; 71 void OnAutoHideStateChanged(ShelfAutoHideState new_state) override;
71 void OnBackgroundUpdated(ShelfBackgroundType background_type, 72 void OnBackgroundUpdated(ShelfBackgroundType background_type,
72 BackgroundAnimatorChangeType change_type) override; 73 BackgroundAnimatorChangeType change_type) override;
73 void WillChangeVisibilityState(ShelfVisibilityState new_state) override; 74 void WillChangeVisibilityState(ShelfVisibilityState new_state) override;
74 75
75 // ShelfIconObserver: 76 // ShelfIconObserver:
76 void OnShelfIconPositionsChanged() override; 77 void OnShelfIconPositionsChanged() override;
77 78
78 // May be null during login and during initialization of a secondary display. 79 // May be null during login and during initialization of a secondary display.
79 Shelf* shelf_ = nullptr; 80 Shelf* shelf_ = nullptr;
80 81
81 // Cached separately because it may be destroyed before |shelf_|. 82 // Cached separately because it may be destroyed before |shelf_|.
82 ShelfLayoutManager* shelf_layout_manager_ = nullptr; 83 ShelfLayoutManager* shelf_layout_manager_ = nullptr;
83 84
84 // Handler for swipe and drag gestures. 85 // Handler for swipe and drag gestures.
85 ShelfGestureHandler gesture_handler_; 86 ShelfGestureHandler gesture_handler_;
86 87
87 base::ObserverList<WmShelfObserver> observers_; 88 base::ObserverList<WmShelfObserver> observers_;
88 89
89 DISALLOW_COPY_AND_ASSIGN(WmShelfAura); 90 DISALLOW_COPY_AND_ASSIGN(WmShelfAura);
90 }; 91 };
91 92
92 } // namespace ash 93 } // namespace ash
93 94
94 #endif // ASH_AURA_WM_SHELF_AURA_H_ 95 #endif // ASH_AURA_WM_SHELF_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698