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

Side by Side Diff: ash/mus/bridge/wm_shelf_mus.h

Issue 2029323002: mash: Convert AshPopupAlignmentDelegate to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments Created 4 years, 6 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_observer.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 12 matching lines...) Expand all
23 public: 23 public:
24 explicit WmShelfMus(ShelfLayoutManager* shelf_layout_manager); 24 explicit WmShelfMus(ShelfLayoutManager* shelf_layout_manager);
25 ~WmShelfMus() override; 25 ~WmShelfMus() override;
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 ShelfBackgroundType GetBackgroundType() const override; 34 ShelfBackgroundType GetBackgroundType() const override;
34 void UpdateVisibilityState() override; 35 void UpdateVisibilityState() override;
35 ShelfVisibilityState GetVisibilityState() const override; 36 ShelfVisibilityState GetVisibilityState() const override;
37 gfx::Rect GetUserWorkAreaBounds() const override;
36 void UpdateIconPositionForWindow(WmWindow* window) override; 38 void UpdateIconPositionForWindow(WmWindow* window) override;
37 gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override; 39 gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override;
38 void AddObserver(WmShelfObserver* observer) override; 40 void AddObserver(WmShelfObserver* observer) override;
39 void RemoveObserver(WmShelfObserver* observer) override; 41 void RemoveObserver(WmShelfObserver* observer) override;
40 42
41 private: 43 private:
42 base::ObserverList<WmShelfObserver> observers_; 44 base::ObserverList<WmShelfObserver> observers_;
43 45
44 ShelfLayoutManager* shelf_layout_manager_; 46 ShelfLayoutManager* shelf_layout_manager_;
45 47
46 DISALLOW_COPY_AND_ASSIGN(WmShelfMus); 48 DISALLOW_COPY_AND_ASSIGN(WmShelfMus);
47 }; 49 };
48 50
49 } // namespace mus 51 } // namespace mus
50 } // namespace ash 52 } // namespace ash
51 53
52 #endif // ASH_MUS_BRIDGE_WM_SHELF_MUS_H_ 54 #endif // ASH_MUS_BRIDGE_WM_SHELF_MUS_H_
OLDNEW
« no previous file with comments | « ash/common/shelf/wm_shelf_observer.h ('k') | ash/mus/bridge/wm_shelf_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698