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

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

Issue 2187953002: mash: Migrate ShelfButton* to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 void UpdateIconPositionForWindow(WmWindow* window) override; 44 void UpdateIconPositionForWindow(WmWindow* window) override;
45 gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override; 45 gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override;
46 bool ProcessGestureEvent(const ui::GestureEvent& event, 46 bool ProcessGestureEvent(const ui::GestureEvent& event,
47 WmWindow* target_window) override; 47 WmWindow* target_window) override;
48 void UpdateAutoHideForMouseEvent(ui::MouseEvent* event) override; 48 void UpdateAutoHideForMouseEvent(ui::MouseEvent* event) override;
49 void UpdateAutoHideForGestureEvent(ui::GestureEvent* event) override; 49 void UpdateAutoHideForGestureEvent(ui::GestureEvent* event) override;
50 void AddObserver(WmShelfObserver* observer) override; 50 void AddObserver(WmShelfObserver* observer) override;
51 void RemoveObserver(WmShelfObserver* observer) override; 51 void RemoveObserver(WmShelfObserver* observer) override;
52 void SetKeyboardBoundsForTesting(const gfx::Rect& bounds) override; 52 void SetKeyboardBoundsForTesting(const gfx::Rect& bounds) override;
53 ShelfLockingManager* GetShelfLockingManagerForTesting() override; 53 ShelfLockingManager* GetShelfLockingManagerForTesting() override;
54 ShelfView* GetShelfViewForTesting() override;
54 55
55 private: 56 private:
56 base::ObserverList<WmShelfObserver> observers_; 57 base::ObserverList<WmShelfObserver> observers_;
57 58
58 ShelfLayoutManager* shelf_layout_manager_; 59 ShelfLayoutManager* shelf_layout_manager_;
59 60
60 DISALLOW_COPY_AND_ASSIGN(WmShelfMus); 61 DISALLOW_COPY_AND_ASSIGN(WmShelfMus);
61 }; 62 };
62 63
63 } // namespace mus 64 } // namespace mus
64 } // namespace ash 65 } // namespace ash
65 66
66 #endif // ASH_MUS_BRIDGE_WM_SHELF_MUS_H_ 67 #endif // ASH_MUS_BRIDGE_WM_SHELF_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698