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

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

Issue 2046843005: mash: Migrate shelf menus to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ash_shell_with_content 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 | « no previous file | 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 "ash/shelf/shelf_icon_observer.h" 10 #include "ash/shelf/shelf_icon_observer.h"
(...skipping 22 matching lines...) Expand all
33 void Shutdown(); 33 void Shutdown();
34 34
35 static Shelf* GetShelf(WmShelf* shelf); 35 static Shelf* GetShelf(WmShelf* shelf);
36 36
37 private: 37 private:
38 void ResetShelfLayoutManager(); 38 void ResetShelfLayoutManager();
39 39
40 // WmShelf: 40 // WmShelf:
41 WmWindow* GetWindow() override; 41 WmWindow* GetWindow() override;
42 ShelfAlignment GetAlignment() const override; 42 ShelfAlignment GetAlignment() const override;
43 void SetAlignment(ShelfAlignment alignment) override;
44 ShelfAutoHideBehavior GetAutoHideBehavior() const override;
45 void SetAutoHideBehavior(ShelfAutoHideBehavior behavior) override;
43 ShelfBackgroundType GetBackgroundType() const override; 46 ShelfBackgroundType GetBackgroundType() const override;
44 void UpdateVisibilityState() override; 47 void UpdateVisibilityState() override;
45 ShelfVisibilityState GetVisibilityState() const override; 48 ShelfVisibilityState GetVisibilityState() const override;
46 void UpdateIconPositionForWindow(WmWindow* window) override; 49 void UpdateIconPositionForWindow(WmWindow* window) override;
47 gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override; 50 gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override;
48 void AddObserver(WmShelfObserver* observer) override; 51 void AddObserver(WmShelfObserver* observer) override;
49 void RemoveObserver(WmShelfObserver* observer) override; 52 void RemoveObserver(WmShelfObserver* observer) override;
50 53
51 // ShelfLayoutManagerObserver: 54 // ShelfLayoutManagerObserver:
52 void WillDeleteShelfLayoutManager() override; 55 void WillDeleteShelfLayoutManager() override;
(...skipping 11 matching lines...) Expand all
64 ShelfLayoutManager* shelf_layout_manager_ = nullptr; 67 ShelfLayoutManager* shelf_layout_manager_ = nullptr;
65 68
66 base::ObserverList<WmShelfObserver> observers_; 69 base::ObserverList<WmShelfObserver> observers_;
67 70
68 DISALLOW_COPY_AND_ASSIGN(WmShelfAura); 71 DISALLOW_COPY_AND_ASSIGN(WmShelfAura);
69 }; 72 };
70 73
71 } // namespace ash 74 } // namespace ash
72 75
73 #endif // ASH_AURA_WM_SHELF_AURA_H_ 76 #endif // ASH_AURA_WM_SHELF_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | ash/aura/wm_shelf_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698