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

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

Issue 2235513002: mash shelf: Don't create shelf DimmerView in ShelfWidget on mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tweaks Created 4 years, 4 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
« no previous file with comments | « ash/common/shelf/wm_dimmer_view.h ('k') | ash/mus/bridge/wm_shelf_mus.h » ('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_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 } 17 }
18 18
19 namespace ash { 19 namespace ash {
20 20
21 class ShelfLockingManager; 21 class ShelfLockingManager;
22 class ShelfView; 22 class ShelfView;
23 class WmDimmerView;
23 class WmShelfObserver; 24 class WmShelfObserver;
24 class WmWindow; 25 class WmWindow;
25 26
26 // Used for accessing global state. 27 // Used for accessing global state.
27 class ASH_EXPORT WmShelf { 28 class ASH_EXPORT WmShelf {
28 public: 29 public:
29 // Returns the window showing the shelf. 30 // Returns the window showing the shelf.
30 virtual WmWindow* GetWindow() = 0; 31 virtual WmWindow* GetWindow() = 0;
31 32
32 virtual ShelfAlignment GetAlignment() const = 0; 33 virtual ShelfAlignment GetAlignment() const = 0;
(...skipping 12 matching lines...) Expand all
45 virtual void SetAutoHideBehavior(ShelfAutoHideBehavior behavior) = 0; 46 virtual void SetAutoHideBehavior(ShelfAutoHideBehavior behavior) = 0;
46 47
47 virtual ShelfAutoHideState GetAutoHideState() const = 0; 48 virtual ShelfAutoHideState GetAutoHideState() const = 0;
48 49
49 // Invoke when the auto-hide state may have changed (for example, when the 50 // Invoke when the auto-hide state may have changed (for example, when the
50 // system tray bubble opens it should force the shelf to be visible). 51 // system tray bubble opens it should force the shelf to be visible).
51 virtual void UpdateAutoHideState() = 0; 52 virtual void UpdateAutoHideState() = 0;
52 53
53 virtual ShelfBackgroundType GetBackgroundType() const = 0; 54 virtual ShelfBackgroundType GetBackgroundType() const = 0;
54 55
56 // Creates a view that dims shelf items. The returned view is owned by its
57 // widget. Returns null if shelf dimming is not supported (e.g. on mus).
58 // TODO(jamescook): Delete this after material design ships, as MD will not
59 // require shelf dimming. http://crbug.com/614453
60 virtual WmDimmerView* CreateDimmerView(bool disable_animations_for_test) = 0;
61
55 // Shelf items are slightly dimmed (e.g. when a window is maximized). 62 // Shelf items are slightly dimmed (e.g. when a window is maximized).
63 // TODO(jamescook): Delete this after material design ships, as MD will not
64 // require shelf dimming. http://crbug.com/614453
56 virtual bool IsDimmed() const = 0; 65 virtual bool IsDimmed() const = 0;
57 66
58 // Whether the shelf item overflow bubble is visible. 67 // Whether the shelf item overflow bubble is visible.
59 // TODO(jamescook): Eliminate when ShelfView moves to //ash/common. 68 // TODO(jamescook): Eliminate when ShelfView moves to //ash/common.
60 // http://crbug.com/615155 69 // http://crbug.com/615155
61 virtual bool IsShowingOverflowBubble() const = 0; 70 virtual bool IsShowingOverflowBubble() const = 0;
62 71
63 // Schedules a repaint for all shelf buttons. 72 // Schedules a repaint for all shelf buttons.
64 // TODO(jamescook): Eliminate when ShelfView moves to //ash/common. 73 // TODO(jamescook): Eliminate when ShelfView moves to //ash/common.
65 // http://crbug.com/615155 74 // http://crbug.com/615155
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 virtual ShelfLockingManager* GetShelfLockingManagerForTesting() = 0; 108 virtual ShelfLockingManager* GetShelfLockingManagerForTesting() = 0;
100 virtual ShelfView* GetShelfViewForTesting() = 0; 109 virtual ShelfView* GetShelfViewForTesting() = 0;
101 110
102 protected: 111 protected:
103 virtual ~WmShelf() {} 112 virtual ~WmShelf() {}
104 }; 113 };
105 114
106 } // namespace ash 115 } // namespace ash
107 116
108 #endif // ASH_COMMON_SHELF_WM_SHELF_H_ 117 #endif // ASH_COMMON_SHELF_WM_SHELF_H_
OLDNEW
« no previous file with comments | « ash/common/shelf/wm_dimmer_view.h ('k') | ash/mus/bridge/wm_shelf_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698