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

Side by Side Diff: ash/mus/bridge/wm_shelf_mus.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_shelf.h ('k') | ash/mus/bridge/wm_shelf_mus.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_MUS_BRIDGE_WM_SHELF_MUS_H_ 5 #ifndef ASH_MUS_BRIDGE_WM_SHELF_MUS_H_
6 #define ASH_MUS_BRIDGE_WM_SHELF_MUS_H_ 6 #define ASH_MUS_BRIDGE_WM_SHELF_MUS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <vector> 10 #include <vector>
(...skipping 15 matching lines...) Expand all
26 26
27 // WmShelf: 27 // WmShelf:
28 WmWindow* GetWindow() override; 28 WmWindow* GetWindow() override;
29 ShelfAlignment GetAlignment() const override; 29 ShelfAlignment GetAlignment() const override;
30 void SetAlignment(ShelfAlignment alignment) override; 30 void SetAlignment(ShelfAlignment alignment) override;
31 ShelfAutoHideBehavior GetAutoHideBehavior() const override; 31 ShelfAutoHideBehavior GetAutoHideBehavior() const override;
32 void SetAutoHideBehavior(ShelfAutoHideBehavior behavior) override; 32 void SetAutoHideBehavior(ShelfAutoHideBehavior behavior) override;
33 ShelfAutoHideState GetAutoHideState() const override; 33 ShelfAutoHideState GetAutoHideState() const override;
34 void UpdateAutoHideState() override; 34 void UpdateAutoHideState() override;
35 ShelfBackgroundType GetBackgroundType() const override; 35 ShelfBackgroundType GetBackgroundType() const override;
36 WmDimmerView* CreateDimmerView(bool disable_animations_for_test) override;
36 bool IsDimmed() const override; 37 bool IsDimmed() const override;
37 bool IsShowingOverflowBubble() const override; 38 bool IsShowingOverflowBubble() const override;
38 void SchedulePaint() override; 39 void SchedulePaint() override;
39 bool IsVisible() const override; 40 bool IsVisible() const override;
40 void UpdateVisibilityState() override; 41 void UpdateVisibilityState() override;
41 ShelfVisibilityState GetVisibilityState() const override; 42 ShelfVisibilityState GetVisibilityState() const override;
42 gfx::Rect GetIdealBounds() override; 43 gfx::Rect GetIdealBounds() override;
43 gfx::Rect GetUserWorkAreaBounds() const override; 44 gfx::Rect GetUserWorkAreaBounds() const override;
44 void UpdateIconPositionForWindow(WmWindow* window) override; 45 void UpdateIconPositionForWindow(WmWindow* window) override;
45 gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override; 46 gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override;
46 bool ProcessGestureEvent(const ui::GestureEvent& event) override; 47 bool ProcessGestureEvent(const ui::GestureEvent& event) override;
47 void AddObserver(WmShelfObserver* observer) override; 48 void AddObserver(WmShelfObserver* observer) override;
48 void RemoveObserver(WmShelfObserver* observer) override; 49 void RemoveObserver(WmShelfObserver* observer) override;
49 void SetKeyboardBoundsForTesting(const gfx::Rect& bounds) override; 50 void SetKeyboardBoundsForTesting(const gfx::Rect& bounds) override;
50 ShelfLockingManager* GetShelfLockingManagerForTesting() override; 51 ShelfLockingManager* GetShelfLockingManagerForTesting() override;
51 ShelfView* GetShelfViewForTesting() override; 52 ShelfView* GetShelfViewForTesting() override;
52 53
53 private: 54 private:
54 base::ObserverList<WmShelfObserver> observers_; 55 base::ObserverList<WmShelfObserver> observers_;
55 56
56 ShelfLayoutManager* shelf_layout_manager_; 57 ShelfLayoutManager* shelf_layout_manager_;
57 58
58 DISALLOW_COPY_AND_ASSIGN(WmShelfMus); 59 DISALLOW_COPY_AND_ASSIGN(WmShelfMus);
59 }; 60 };
60 61
61 } // namespace mus 62 } // namespace mus
62 } // namespace ash 63 } // namespace ash
63 64
64 #endif // ASH_MUS_BRIDGE_WM_SHELF_MUS_H_ 65 #endif // ASH_MUS_BRIDGE_WM_SHELF_MUS_H_
OLDNEW
« no previous file with comments | « ash/common/shelf/wm_shelf.h ('k') | ash/mus/bridge/wm_shelf_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698