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

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

Issue 2147143002: [Chrome OS MD] Draw a 1px separator between 2 tray items (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments 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 | « no previous file | ash/aura/wm_shelf_aura.cc » ('j') | ash/common/shelf/wm_shelf.h » ('J')
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/shelf_icon_observer.h" 9 #include "ash/common/shelf/shelf_icon_observer.h"
10 #include "ash/common/shelf/wm_shelf.h" 10 #include "ash/common/shelf/wm_shelf.h"
11 #include "ash/shelf/shelf_layout_manager_observer.h" 11 #include "ash/shelf/shelf_layout_manager_observer.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/observer_list.h" 13 #include "base/observer_list.h"
14 14
15 namespace ash { 15 namespace ash {
16 16
17 class Shelf; 17 class Shelf;
18 class ShelfLayoutManager; 18 class ShelfLayoutManager;
19 class StatusAreaWidget;
James Cook 2016/08/11 20:36:54 nit: not needed (in general, if an interface from
yiyix 2016/08/18 00:42:59 Done.
19 20
20 // Aura implementation of WmShelf. 21 // Aura implementation of WmShelf.
21 class ASH_EXPORT WmShelfAura : public WmShelf, 22 class ASH_EXPORT WmShelfAura : public WmShelf,
22 public ShelfLayoutManagerObserver, 23 public ShelfLayoutManagerObserver,
23 public ShelfIconObserver { 24 public ShelfIconObserver {
24 public: 25 public:
25 WmShelfAura(); 26 WmShelfAura();
26 ~WmShelfAura() override; 27 ~WmShelfAura() override;
27 28
28 // This object is initialized in multiple steps as the RootWindowController 29 // This object is initialized in multiple steps as the RootWindowController
(...skipping 26 matching lines...) Expand all
55 bool IsVisible() const override; 56 bool IsVisible() const override;
56 void UpdateVisibilityState() override; 57 void UpdateVisibilityState() override;
57 ShelfVisibilityState GetVisibilityState() const override; 58 ShelfVisibilityState GetVisibilityState() const override;
58 gfx::Rect GetIdealBounds() override; 59 gfx::Rect GetIdealBounds() override;
59 gfx::Rect GetUserWorkAreaBounds() const override; 60 gfx::Rect GetUserWorkAreaBounds() const override;
60 void UpdateIconPositionForWindow(WmWindow* window) override; 61 void UpdateIconPositionForWindow(WmWindow* window) override;
61 gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override; 62 gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override;
62 bool ProcessGestureEvent(const ui::GestureEvent& event) override; 63 bool ProcessGestureEvent(const ui::GestureEvent& event) override;
63 void AddObserver(WmShelfObserver* observer) override; 64 void AddObserver(WmShelfObserver* observer) override;
64 void RemoveObserver(WmShelfObserver* observer) override; 65 void RemoveObserver(WmShelfObserver* observer) override;
66 StatusAreaWidget* GetStatusAreaWidget() override;
65 void SetKeyboardBoundsForTesting(const gfx::Rect& bounds) override; 67 void SetKeyboardBoundsForTesting(const gfx::Rect& bounds) override;
66 ShelfLockingManager* GetShelfLockingManagerForTesting() override; 68 ShelfLockingManager* GetShelfLockingManagerForTesting() override;
67 ShelfView* GetShelfViewForTesting() override; 69 ShelfView* GetShelfViewForTesting() override;
68 70
69 // ShelfLayoutManagerObserver: 71 // ShelfLayoutManagerObserver:
70 void WillDeleteShelfLayoutManager() override; 72 void WillDeleteShelfLayoutManager() override;
71 void OnAutoHideStateChanged(ShelfAutoHideState new_state) override; 73 void OnAutoHideStateChanged(ShelfAutoHideState new_state) override;
72 void OnBackgroundUpdated(ShelfBackgroundType background_type, 74 void OnBackgroundUpdated(ShelfBackgroundType background_type,
73 BackgroundAnimatorChangeType change_type) override; 75 BackgroundAnimatorChangeType change_type) override;
74 void WillChangeVisibilityState(ShelfVisibilityState new_state) override; 76 void WillChangeVisibilityState(ShelfVisibilityState new_state) override;
(...skipping 11 matching lines...) Expand all
86 88
87 // Forwards mouse and gesture events to ShelfLayoutManager for auto-hide. 89 // Forwards mouse and gesture events to ShelfLayoutManager for auto-hide.
88 std::unique_ptr<AutoHideEventHandler> auto_hide_event_handler_; 90 std::unique_ptr<AutoHideEventHandler> auto_hide_event_handler_;
89 91
90 DISALLOW_COPY_AND_ASSIGN(WmShelfAura); 92 DISALLOW_COPY_AND_ASSIGN(WmShelfAura);
91 }; 93 };
92 94
93 } // namespace ash 95 } // namespace ash
94 96
95 #endif // ASH_AURA_WM_SHELF_AURA_H_ 97 #endif // ASH_AURA_WM_SHELF_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | ash/aura/wm_shelf_aura.cc » ('j') | ash/common/shelf/wm_shelf.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698