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

Side by Side Diff: ash/aura/wm_shelf_aura.h

Issue 2550413004: Remove Ash shelf dimmer. (Closed)
Patch Set: jamescook review Created 4 years 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/BUILD.gn ('k') | ash/aura/wm_shelf_aura.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 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 "base/macros.h" 10 #include "base/macros.h"
11 11
12 namespace ash { 12 namespace ash {
13 13
14 class ShelfBezelEventHandler; 14 class ShelfBezelEventHandler;
15 15
16 // Aura implementation of WmShelf. 16 // Aura implementation of WmShelf.
17 class ASH_EXPORT WmShelfAura : public WmShelf { 17 class ASH_EXPORT WmShelfAura : public WmShelf {
18 public: 18 public:
19 WmShelfAura(); 19 WmShelfAura();
20 ~WmShelfAura() override; 20 ~WmShelfAura() override;
21 21
22 // WmShelf: 22 // WmShelf:
23 WmDimmerView* CreateDimmerView(bool disable_animations_for_test) override;
24 void CreateShelfWidget(WmWindow* root) override; 23 void CreateShelfWidget(WmWindow* root) override;
25 void WillDeleteShelfLayoutManager() override; 24 void WillDeleteShelfLayoutManager() override;
26 void WillChangeVisibilityState(ShelfVisibilityState new_state) override; 25 void WillChangeVisibilityState(ShelfVisibilityState new_state) override;
27 26
28 private: 27 private:
29 class AutoHideEventHandler; 28 class AutoHideEventHandler;
30 29
31 // Forwards mouse and gesture events to ShelfLayoutManager for auto-hide. 30 // Forwards mouse and gesture events to ShelfLayoutManager for auto-hide.
32 // TODO(mash): Facilitate simliar functionality in mash: crbug.com/631216 31 // TODO(mash): Facilitate simliar functionality in mash: crbug.com/631216
33 std::unique_ptr<AutoHideEventHandler> auto_hide_event_handler_; 32 std::unique_ptr<AutoHideEventHandler> auto_hide_event_handler_;
34 33
35 // Forwards touch gestures on a bezel sensor to the shelf. 34 // Forwards touch gestures on a bezel sensor to the shelf.
36 // TODO(mash): Facilitate simliar functionality in mash: crbug.com/636647 35 // TODO(mash): Facilitate simliar functionality in mash: crbug.com/636647
37 std::unique_ptr<ShelfBezelEventHandler> bezel_event_handler_; 36 std::unique_ptr<ShelfBezelEventHandler> bezel_event_handler_;
38 37
39 DISALLOW_COPY_AND_ASSIGN(WmShelfAura); 38 DISALLOW_COPY_AND_ASSIGN(WmShelfAura);
40 }; 39 };
41 40
42 } // namespace ash 41 } // namespace ash
43 42
44 #endif // ASH_AURA_WM_SHELF_AURA_H_ 43 #endif // ASH_AURA_WM_SHELF_AURA_H_
OLDNEW
« no previous file with comments | « ash/BUILD.gn ('k') | ash/aura/wm_shelf_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698