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

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

Issue 2679333002: [ash-md] Remove the number of animators used for the Shelf animations. (Closed)
Patch Set: Created 3 years, 10 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 <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 void SetVirtualKeyboardBoundsForTesting(const gfx::Rect& bounds); 139 void SetVirtualKeyboardBoundsForTesting(const gfx::Rect& bounds);
140 ShelfLockingManager* GetShelfLockingManagerForTesting(); 140 ShelfLockingManager* GetShelfLockingManagerForTesting();
141 ShelfView* GetShelfViewForTesting(); 141 ShelfView* GetShelfViewForTesting();
142 142
143 protected: 143 protected:
144 // ShelfLayoutManagerObserver: 144 // ShelfLayoutManagerObserver:
145 void WillDeleteShelfLayoutManager() override; 145 void WillDeleteShelfLayoutManager() override;
146 void WillChangeVisibilityState(ShelfVisibilityState new_state) override; 146 void WillChangeVisibilityState(ShelfVisibilityState new_state) override;
147 void OnAutoHideStateChanged(ShelfAutoHideState new_state) override; 147 void OnAutoHideStateChanged(ShelfAutoHideState new_state) override;
148 void OnBackgroundUpdated(ShelfBackgroundType background_type, 148 void OnBackgroundUpdated(ShelfBackgroundType background_type,
149 BackgroundAnimatorChangeType change_type) override; 149 gfx::AnimationChangeType change_type) override;
150 150
151 private: 151 private:
152 class AutoHideEventHandler; 152 class AutoHideEventHandler;
153 friend class ShelfLayoutManagerTest; 153 friend class ShelfLayoutManagerTest;
154 154
155 // Layout manager for the shelf container window. Instances are constructed by 155 // Layout manager for the shelf container window. Instances are constructed by
156 // ShelfWidget and lifetimes are managed by the container windows themselves. 156 // ShelfWidget and lifetimes are managed by the container windows themselves.
157 ShelfLayoutManager* shelf_layout_manager_ = nullptr; 157 ShelfLayoutManager* shelf_layout_manager_ = nullptr;
158 158
159 std::unique_ptr<ShelfWidget> shelf_widget_; 159 std::unique_ptr<ShelfWidget> shelf_widget_;
(...skipping 18 matching lines...) Expand all
178 // Forwards touch gestures on a bezel sensor to the shelf. 178 // Forwards touch gestures on a bezel sensor to the shelf.
179 // TODO(mash): Facilitate simliar functionality in mash: crbug.com/636647 179 // TODO(mash): Facilitate simliar functionality in mash: crbug.com/636647
180 std::unique_ptr<ShelfBezelEventHandler> bezel_event_handler_; 180 std::unique_ptr<ShelfBezelEventHandler> bezel_event_handler_;
181 181
182 DISALLOW_COPY_AND_ASSIGN(WmShelf); 182 DISALLOW_COPY_AND_ASSIGN(WmShelf);
183 }; 183 };
184 184
185 } // namespace ash 185 } // namespace ash
186 186
187 #endif // ASH_COMMON_SHELF_WM_SHELF_H_ 187 #endif // ASH_COMMON_SHELF_WM_SHELF_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698