| OLD | NEW | 
|---|
| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 51   void UpdateVisibilityState() override; | 51   void UpdateVisibilityState() override; | 
| 52   ShelfVisibilityState GetVisibilityState() const override; | 52   ShelfVisibilityState GetVisibilityState() const override; | 
| 53   gfx::Rect GetIdealBounds() override; | 53   gfx::Rect GetIdealBounds() override; | 
| 54   gfx::Rect GetUserWorkAreaBounds() const override; | 54   gfx::Rect GetUserWorkAreaBounds() const override; | 
| 55   void UpdateIconPositionForWindow(WmWindow* window) override; | 55   void UpdateIconPositionForWindow(WmWindow* window) override; | 
| 56   gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override; | 56   gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override; | 
| 57   void UpdateAutoHideForMouseEvent(ui::MouseEvent* event) override; | 57   void UpdateAutoHideForMouseEvent(ui::MouseEvent* event) override; | 
| 58   void UpdateAutoHideForGestureEvent(ui::GestureEvent* event) override; | 58   void UpdateAutoHideForGestureEvent(ui::GestureEvent* event) override; | 
| 59   void AddObserver(WmShelfObserver* observer) override; | 59   void AddObserver(WmShelfObserver* observer) override; | 
| 60   void RemoveObserver(WmShelfObserver* observer) override; | 60   void RemoveObserver(WmShelfObserver* observer) override; | 
|  | 61   void SetKeyboardBoundsForTesting(const gfx::Rect& bounds) override; | 
| 61 | 62 | 
| 62   // ShelfLayoutManagerObserver: | 63   // ShelfLayoutManagerObserver: | 
| 63   void WillDeleteShelfLayoutManager() override; | 64   void WillDeleteShelfLayoutManager() override; | 
| 64   void OnAutoHideStateChanged(ShelfAutoHideState new_state) override; | 65   void OnAutoHideStateChanged(ShelfAutoHideState new_state) override; | 
| 65   void OnBackgroundUpdated(ShelfBackgroundType background_type, | 66   void OnBackgroundUpdated(ShelfBackgroundType background_type, | 
| 66                            BackgroundAnimatorChangeType change_type) override; | 67                            BackgroundAnimatorChangeType change_type) override; | 
| 67   void WillChangeVisibilityState(ShelfVisibilityState new_state) override; | 68   void WillChangeVisibilityState(ShelfVisibilityState new_state) override; | 
| 68 | 69 | 
| 69   // ShelfIconObserver: | 70   // ShelfIconObserver: | 
| 70   void OnShelfIconPositionsChanged() override; | 71   void OnShelfIconPositionsChanged() override; | 
| 71 | 72 | 
| 72   // May be null during login and during initialization of a secondary display. | 73   // May be null during login and during initialization of a secondary display. | 
| 73   Shelf* shelf_ = nullptr; | 74   Shelf* shelf_ = nullptr; | 
| 74 | 75 | 
| 75   // Cached separately because it may be destroyed before |shelf_|. | 76   // Cached separately because it may be destroyed before |shelf_|. | 
| 76   ShelfLayoutManager* shelf_layout_manager_ = nullptr; | 77   ShelfLayoutManager* shelf_layout_manager_ = nullptr; | 
| 77 | 78 | 
| 78   base::ObserverList<WmShelfObserver> observers_; | 79   base::ObserverList<WmShelfObserver> observers_; | 
| 79 | 80 | 
| 80   DISALLOW_COPY_AND_ASSIGN(WmShelfAura); | 81   DISALLOW_COPY_AND_ASSIGN(WmShelfAura); | 
| 81 }; | 82 }; | 
| 82 | 83 | 
| 83 }  // namespace ash | 84 }  // namespace ash | 
| 84 | 85 | 
| 85 #endif  // ASH_AURA_WM_SHELF_AURA_H_ | 86 #endif  // ASH_AURA_WM_SHELF_AURA_H_ | 
| OLD | NEW | 
|---|